Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: aadd6bf231

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

Change-Id: I90d4ae780df750d614bd955c2c35bf72cddc35f6