Merge "Catch ServiceSpecificExceptions properly when getting reg state/ transport type" into sc-dev am: 369f574b am: b32bae66

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

Change-Id: Ic75f9c667840770c06142ec7fe7de17a4efb8676