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

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

Change-Id: Ie00dcc824329d00e95b80fa6a2006f1fb7dacca8