[automerger skipped] Merge "[Telephony] remove the RuntimeException thrown"...

[automerger skipped] Merge "[Telephony] remove the RuntimeException thrown" am: 841bcc5b am: f01408d5 am: cfe1d388 am: a4caf5c7 -s ours

am skip reason: Merged-In I050d4affd403604bdae21ef3bc7f9ddf93ffa9e4 with SHA-1 644906d6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033543

Change-Id: I8b1699263ded6453aa4008825e9bcd191577fb06