Merge "Fixed NPE when local or remote port range does not exist" am: 4e6d04a608

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1944225

Change-Id: If75d5ec910d00998142241f5a67c0c232885210e