Merge "Remove NETWORK_STACK_UID check" am: 7044a8f3c7 am: 9b45108b82

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

Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4