Merge "[MS26.1] Remove Process.NETWORK_STACK_UID dependency" am: c938ae401e am: 0b5c5cbac0 am: 369763027d

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

Change-Id: I4daa1114a27eb005914ed16ed7c90e503f94381d