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

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

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