[automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246d -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246d -s ours am: e40637ad -s ours am: 53e7b5b6 -s ours

am skip reason: Merged-In I66e5209ddfba025f43ca0beb7067e6e0e29f9e46 with SHA-1 41aaa16f is already in history

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

Change-Id: Ie578b224a05a5ce1e32444bc55fc5acdebe84414