Merge "Add more detail to exception message" am: a5ce468b90 am: 60061838a4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fa4430d0c10d38c422ab5799afc45be92f8c2a9