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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c1a5e72a4960d8808e2d512c0dd248001a3311f