Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into...

Merge changes from topic "presubmit-am-286363504fe543f8a04966cf7cc71a4b" into sc-v2-dev-plus-aosp am: 31d5f5bb am: 97ca0056

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



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