[automerger skipped] Merge "Merge Android 12" am: 59772dd098 -s ours am: c8e48296a0 -s ours

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

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

Change-Id: I98de3f79fad3ed7d759d02203076b1fd6d4d1b76