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