[automerger skipped] Merge Android 12 QPR 3 am: 7fc936fd -s ours am:...

[automerger skipped] Merge Android 12 QPR 3 am: 7fc936fd -s ours am: 47c3def2 -s ours am: 2b46fc2b -s ours am: 02fbce06 -s ours am: 1005bba8 -s ours

am skip reason: Merged-In I8564456248d0b01eb521d575ef540689c8035d3d with SHA-1 50e113f8 is already in history

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



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