Merge "Merge QQ3A.200805.001" am: a8fbfa0313 am: 9e14c91965

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

Change-Id: Ib36dea00e6afaf0cedaaf55a1edffea8cbcb91e2