Merge "Fixed NPE" into tm-dev am: a4c6fff8 am: e4000693

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18513131



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