[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 0ea366ae...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 0ea366ae -s ours am: c446f15a -s ours am: fc204d27 -s ours am: 36c7f4a1 -s ours

am skip reason: Change-Id I9ecbc59b232d715cbe74fd54ccbe83e10f34a0c0 with SHA-1 ebd65659 is in history

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

Change-Id: Ifc32f791f17adb44d7095f53893d3a3531daa24c