Merge cherrypicks of [19048695] into tm-release. am: 838fd09d2f

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

Change-Id: I7bb67dc967c18049cf912ec2122b9046d71f03e3
Signed-off-by: Automerger Merge Worker <[email protected]>