[automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: f104ed681e -s ours am: e93e967761 -s ours am: 31b6677cb8 -s ours am: 7978db625f -s ours am: 9b3443ca56 -s ours

am skip reason: subject contains skip directive

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

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