[automerger skipped] Merge "Merge Android 12" am: 9e3f3ff729 -s ours am: ffbfbce2ce -s ours am: 1c439fa1df -s ours am: e7b26e0b69 -s ours

am skip reason: Merged-In I4fb6bf1f3f0683aa16a62a6c9aeab074429a71bf with SHA-1 c76f905105 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1847737

Change-Id: I0453c88ae8a53810c6bde898ab6a21449e1461ef