[automerger skipped] Merge Android 12L am: cbc6a330 -s ours am: d41b77b0...

[automerger skipped] Merge Android 12L am: cbc6a330 -s ours am: d41b77b0 -s ours am: c0b2e514 -s ours am: aba5134c -s ours am: 22101277 -s ours

am skip reason: Merged-In Ib7ed106fb09dcfa246bd0a31515fbbb358259de0 with SHA-1 bfdd991c is already in history

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

Change-Id: I17a25874452edde30899b2311d00011062e77a70