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