[automerger skipped] Merge "Merge android10-qpr3-release to aosp-master - DO NOT MERGE" am: 39b8107e8f am: 84d628b604 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If8491fed99ce0d3a158e694d95b3c6348a04c9b4