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

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



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