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