Merge changes from topic "am-bdb3615428914123be143a4326b6e603" into main am: a7fa1e1a -s ours

am skip reason: Merged-In I4a4129d221778906fb739a574d7adb48e91e9eda with SHA-1 a7d257cc is already in history

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



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