Merge "Catch when telecom isn't ready yet" into tm-dev am: 5a633e1b am:...

Merge "Catch when telecom isn't ready yet" into tm-dev am: 5a633e1b am: 5ca656b3 am: bbc4d70b am: 16f79b34

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



Change-Id: I59b10e163f0fb22884bfeb79517d1f83820a17a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>