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