[automerger skipped] Cherrypicked from...

[automerger skipped] Cherrypicked from https://android-review.git.corp.google.com/c/platform/build/+/1314951 am: 54e92c98 -s ours

am skip reason: Change-Id I56119259add1435215958b51a58bc1b971f27067 with SHA-1 eac6ed64 is in history

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

Change-Id: I94c865de759520b7a93e0f6dd9cb6d4d07cc8ef3