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