[automerger skipped] Merge "Merge Android 12 QPR1" am: b16c246ddc -s ours am: e40637adf0 -s ours am: 53e7b5b60b -s ours am: 7eab7e559d -s ours

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

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

Change-Id: I598f6bda27ce1fe36bb92cca338e580414104e57