[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 4cca7b57 -s ours...

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 4cca7b57 -s ours am: c4f55277 -s ours am: 9be0ca2c -s ours

am skip reason: Merged-In I6a50f6d5abc485cb4fb38df7383a5cc83ad20a86 with SHA-1 8adaed5f is already in history

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



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