Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: d83ab15ea7

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

Change-Id: I69ed09c90c015083a71e40dc2f5f5aca5fcf3b0c