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

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

Change-Id: I589ddfd54d1a77b141593f0985f62ced82772452