[automerger skipped] Merge "Merge Android 12" am: 59772dd0 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 59772dd0 -s ours am: c8e48296 -s ours am: c6364f6c -s ours

am skip reason: Merged-In I76b505672b7c78b03a9c79df6473212ea5c65072 with SHA-1 4e9cab82 is already in history

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

Change-Id: Iff64f8b7ad443b781006856f5ec4bff21075adbd