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