[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am:...

[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: e3f79d4f -s ours am: bc9ac741 -s ours am: cd315d0c -s ours am: 157bee56 -s ours am: 39af30ee -s ours

am skip reason: subject contains skip directive

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



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