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