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

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

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

Change-Id: I2bf336ed697fc6121d9bb3a6aed41b982a72f99f