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

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

Change-Id: I3c3118c9a3414b2eea82ffbf954e4b7720f62030