[automerger skipped] Merge Android 12 QPR1 am: f12fed3263 -s ours am: 94498017e4 -s ours am: 1557779ae1 -s ours

am skip reason: Merged-In I763fe1f06e96203a0b7b13ea1d94012d12a3850c with SHA-1 9cc09d8dc1 is already in history

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

Change-Id: I329f09132a457e5d6f25dbc47108886575c4732f