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