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: 240b4e7b am: 423c67af am: 1274704e

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



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