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