Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19378806 Change-Id: I44c8d083dbda8a5d356e002f69cd508ae34fecfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>