[automerger skipped] Merge Android 12 am: adff3733bc -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: I9bdb838249e42204e277ae60b2f82f15bd242c65