Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into...

Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589 am: cd608825 am: 50d29f77 am: 63c3099d am: 660e9fa2 am: 1c6aa543

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



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