[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f36e10b1 -s ours am: 4e4d3f87 -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: I104c8b4eed834e5b4f7593bc9be17fe339acceb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>