[automerger skipped] Merge Android 12L am: cbc6a3305e -s ours am: d41b77b073 -s ours

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

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

Change-Id: I4081af08606ce90f02d07880cd52f9d0ee327b54