[automerger skipped] Merge "Fixed NPE when local or remote port range does not...

[automerger skipped] Merge "Fixed NPE when local or remote port range does not exist" into sc-v2-dev am: c7d8866a -s ours am: 2f62c391 -s ours

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

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

Change-Id: Ifc25e720c94ad593306d590230cc365a2ca8864c