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: 3d22bca3 am: 54f45151

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



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