[automerger skipped] Partial cherry-pick of ag/10260813 am: 9ebefc64 am:...

[automerger skipped] Partial cherry-pick of ag/10260813 am: 9ebefc64 am: 9f2e9e1a -s ours am: 70dead43 -s ours

am skip reason: Change-Id Iaeefb35137de01c6ea57115d8830dd9bc30eccba with SHA-1 25648e60 is in history

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

Change-Id: Id3ac1e8d04ec5952b33337186e6d077a75960d6e