Merge changes I19a08bf2,Ibab914e5 into main am: 63f2d84e68

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

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