[automerger skipped] Merge "Fixed NPE when local or remote port range does not exist" am: 4e6d04a6 am: f4e93e28 am: 7b25ef8e am: d51fc1fb -s ours

am skip reason: Merged-In I749f369c0daa5c840a77d37828f65e42262d85f5 with SHA-1 bc1ae5c2 is already in history

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

Change-Id: Ia1484f259d294dac2cb775ad26ea79f67ae76051