Merge changes I19a08bf2,Ibab914e5 into main am: 63f2d84e am: f9c141df am: 806f5fc9

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



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