[automerger skipped] Merge "Merge Android 12 QPR 3" am: 1af1b08868 -s ours am: f3f77aa2a9 -s ours

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

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

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