Merge changes I1d745f64,I4bb2572c into main am: 94b63ab755 am: b1ce8cb40e am: 4828f5aa75

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

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