Merge changes I19a08bf2,Ibab914e5 into main am: 63f2d84e68 am: f9c141dfb6 am: 806f5fc951 am: 1e188f2ca9 am: 99fc575fcf

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2731393

Change-Id: Id9db831e69f8a33e774dc7679647f08c84ae3ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>