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