[automerger skipped] Merge Android 12 am: adff3733bc -s ours am: 986363410a -s ours am: ec29496d9e -s ours am: d222b9cd37 -s ours am: d124ffb186 -s ours

am skip reason: Merged-In I000fad1ecc527f6de8cbd0ce812e08ab7a8ae9d1 with SHA-1 76ae3aae14 is already in history

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

Change-Id: I343093577b6d1356915a21cc8d965dc02ceb6b93