[automerger skipped] Merge "Add null check to...

[automerger skipped] Merge "Add null check to RadioInterfaceCapabilityController" am: acd3edd5 am: 0ee37c89 -s ours am: b4ba9221 -s ours

am skip reason: Merged-In I03027c3d9a8f6b9da63f8f1480acfe7a2f4e32bf with SHA-1 6919872b is already in history

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

Change-Id: Ia011ce1a031222c8e66cddc96e6c4fdd8b3f4ed2