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