[automerger skipped] Merge "Merge Android 12" am: b9b28016 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: b9b28016 -s ours am: 9a82d5d3 -s ours am: ef79b326 -s ours am: 625ebd3f -s ours am: e61fa41f -s ours

am skip reason: Merged-In I92a002aa926d8d48637e35b26c41ef65026e8eed with SHA-1 ab1d0dc3 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1847373

Change-Id: Icbcc46a9349e59fb887b78ab6bdaa151ba31c81e