[automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 13b4951c -s ours

am skip reason: subject contains skip directive

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



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