[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c045ec9dd2 -s ours am: 5daeacafac -s ours am: 657be67363 -s ours

am skip reason: Merged-In I01040f537f57008e11d5aa693591fa8adab2c6b1 with SHA-1 f0651f3179 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17544436

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