[automerger skipped] Fixed NPE when local or remote port range does not exist am: db7565b9 am: b7217196 -s ours

am skip reason: Merged-In Ic6bdeac05fedd02045d094fe2d1cbbaa7413208a with SHA-1 210ec3af is already in history

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

Change-Id: I78b17126383eadea5c82f9231d7ad4ba9a84f33c