Android 12.0.0 Release 29 (SQ1D.220205.003)
[automerger skipped] Merge ab/7633965 am: 2b8aebde61 -s ours am: b2c09d61d4 -s ours

am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 185c7d4a83 is already in history

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

Change-Id: Iadf3fe1065c00c0aaa99a8d731ae619499f84bb0