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