Merge changes Ic51d603d,Ia50def0d,I22f65b8b,I8ce9f230,Id8455eb1, ... into main am: 3143e6930b am: 1afd920ac6

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

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