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