[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: 985786ff -s ours am: 0613a73f -s ours am: dc744cca -s ours

am skip reason: subject contains skip directive

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



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