[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e9b7488304 -s ours am: 0adb8035a5 -s ours am: 5c0790beff -s ours

am skip reason: Merged-In Id10904a7d2efd449cca404f3b94707259362b815 with SHA-1 51c85c595d is already in history

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

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