Merge "Merge QQ3A.200805.001" am: a8fbfa0313 am: 9e14c91965 am: e4b4bd0c8f am: 0a275a18ed am: 0c4bc30331

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

Change-Id: I9ba84d325e960662eb531de81f79601471ae9b8d