[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 138ba4b0e7 -s ours

am skip reason: Change-Id I4fe471a73c6b261295610bb5f04aa964f4bae6af with SHA-1 32f4342b75 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1323643

Change-Id: Ie68de481a6e21c6f05046b52abebd70f65b72422