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

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

Change-Id: I7aa822a2ada0a60bcae1433b4035421b94c8bd7d