[automerger skipped] Merge "Merge Android 12" am: 3c2f8349f2 -s ours am: adefc05788 -s ours am: c5aeaf2b58 -s ours

am skip reason: Merged-In Ibf274d5809120d2ca58dd35865d8ec0a76b9925a with SHA-1 0ce1327bf5 is already in history

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

Change-Id: I261d9f7e4c6d6caac9a7ef340a72822b170532be