Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39df

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

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