Merge "Merge android10-qpr3-release to aosp-master - DO NOT MERGE" am: 39b8107e8f

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

Change-Id: Ib03d8f69bd387ac76b0a8c6eeb218a14f9837bf3