[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: ca140b19 -s ours am: 42bb3aba -s ours

am skip reason: subject contains skip directive

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



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