Merge changes Icfaa316b,Ic26706d7 into main am: 671b88bf73

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

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