[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: bd318c0f -s ours am: 6e732255 -s ours

am skip reason: subject contains skip directive

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



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