Merge changes I93619476,Idc284541 into main am: 1d1198c209 am: e424e4ae2f

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

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