Merge changes Icfaa316b,Ic26706d7 into main am: 671b88bf73 am: 02e41b2f79 am: 8dbed42cc2

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

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