[automerger skipped] Merge "Check for null when converting nullables" am:...

[automerger skipped] Merge "Check for null when converting nullables" am: f6ca8048 am: 0331a3d7 am: 6ae79510 am: 4917bbfa -s ours

am skip reason: Merged-In I3fe8dcca3900bf7a44bdb918eca9a6a7959653ed with SHA-1 d79f19c5 is already in history

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

Change-Id: Ic8655f00562285315683de939663a2a9a2c3bf66