[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0f71a41083 -s ours am: aab6924c82 -s ours am: f4ff6b754d -s ours am: 221005aa9d -s ours

am skip reason: Merged-In If209f5e5821393769b1b6f1d12b1aa4599d33abc with SHA-1 70a9dc84a1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/17544711

Change-Id: I692e3aee0cfa8a12fa2e631b92046e586a05991b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>