tree 0b8559aecc94af899c464ff17543abb5a8437538
parent 8885169a2e11287483bd60381b4c5444d240de93
parent f23bda53b2b7ee3b046a7ab856d81d37a8787ccb
author Lucas Lin <lucaslin@google.com> 1615898669 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615898669 +0000

Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e am: f23bda53b2

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

Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4