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

am skip reason: subject contains skip directive

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

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