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