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

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

Change-Id: Icade0541f309622e39c9b02d86fbb6822c378fb1