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

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



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