Merge "Merge QQ3A.200805.001" am: a8fbfa0313

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

Change-Id: I3689587a5fcb558a3f28f06f05a311f374e7cd00