Merge changes If8f281ec,Id711ba79 into main am: 275fc31337 am: 9fdb6fe412

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

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