Merge changes from topic "am-98c820a193e44cdb83d126d718ab5c09" into main am: 6a93b615 -s ours

am skip reason: Merged-In I226cbaaae0462598e6d9450428aa3b669284a521 with SHA-1 03d62d56 is already in history

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



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