[automerger skipped] Merge "DO NOT MERGE: manually cherry pick" into main am:...

[automerger skipped] Merge "DO NOT MERGE: manually cherry pick" into main am: fa476051 -s ours am: 86c236ca -s ours

am skip reason: contains skip directive

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



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