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