Merge "Revert^2 "DO NOT MERGE: manually cherry pick"" into aosp-main-future am: e4c2af82

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



Change-Id: Id5d1a8ed3b1cae89c2deca2e07d53c928f7ab4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>