[automerger skipped] Merge Android 12 am: e4b1e6f295 -s ours am: 15b58a311f -s ours

am skip reason: Merged-In Ic49cadf46a18852d4d4a4fe2fac6f0e419e89eab with SHA-1 4006c9667a is already in history

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

Change-Id: I302628234ffa1729ae35003e7ae986ac6396744d