[automerger skipped] Merge "BugFix - null check" am: 3356457d am: 5bdecb61...

[automerger skipped] Merge "BugFix - null check" am: 3356457d am: 5bdecb61 am: d1af2d34 am: 4c1e3ba1 -s ours

am skip reason: Merged-In Ibc747badd85a7dbb3eef8678ab61b1513c549094 with SHA-1 d4f85b0e is already in history

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

Change-Id: I12d6e0110b2c5e83e5f8d2392a8dad94ee7e0f47