[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into...

[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: 25e75783 -s ours am: 72e5ee73 -s ours

am skip reason: Merged-In Ib35026f71208afa53f33ee9967cd9acb88a73d0d with SHA-1 c28d4311 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17544969



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