[automerger skipped] Revert "Cherrypicked from...

[automerger skipped] Revert "Cherrypicked from https://android-review.git.corp.google..." am: 4bf0af41 -s ours

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

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

Change-Id: I1ee4c7be5173f1287113ab963dc7c4a3db33774d