Merge "Handles Telephony service not up fatal exception in CallerInfoAsyncQuery" into sc-dev am: f3dc01bf8c

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

Change-Id: I97a717f92f0b2c12542d1bc7db1818f6258f16aa