[automerger skipped] Merge "Merge Android 12 QPR1" am: c0723d7fb4 -s ours am: 2d0a6ccd09 -s ours am: 8607521de4 -s ours am: a02f04d0c8 -s ours

am skip reason: Merged-In I855f1f0b6bd10d54941d56889eb6b025ac11a693 with SHA-1 9fb33388af is already in history

Original change: https://android-review.googlesource.com/c/device/common/+/1921920

Change-Id: I844e738a534d6120e9098821b13ed6a90f65d649