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

am skip reason: subject contains skip directive

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

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