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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I739ee4cca22e6642f0b48f43c5f7b4324da673f4