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

[automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: df7ce9f5 -s ours am: 12fd508e -s ours am: abcaf0fc -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2147031



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