Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into...

Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e2 am: e82eda25

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851



Change-Id: I7aff25a009ee1804cc3aafe4d783937a5d12d6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>