Merge changes I1d745f64,I4bb2572c into main am: 94b63ab755 am: 798a70b223 am: a79d969cff

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

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