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

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

Change-Id: Ic6a1e5fad4179e78dca59d6fd7b3fd057dd28f50