[automerger skipped] Merge Android 12 am: bfb22c8be4 -s ours

am skip reason: Merged-In Ib3add5564057415ef6f968d017deb806de48c397 with SHA-1 2ec6d4f4e8 is already in history

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

Change-Id: Ib975df15ded15d712acf2bd8f59e0f2507f7be64