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