[automerger skipped] Merge "DO NOT MERGE - Skip ab/7272582" into...

[automerger skipped] Merge "DO NOT MERGE - Skip ab/7272582" into stage-aosp-master am: 2564864b -s ours

am skip reason: Merged-In I5897c3587b19a3343b899f90f798185f921172a7 with SHA-1 d71e6ef6 is already in history

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

Change-Id: Ia67e65117b5ab0af4de170c1a55b57ac65711172