Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e

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

Change-Id: I5ae4b49d3168e48ccd6b61ee349ae89041e3de05