Merge "Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev am: de66540fd3 am: 0da215640f" into nyc-mr1-dev-plus-aosp
am: 7938df3cfc
* commit '7938df3cfcab9dac33cde9b219f8e3614836ea2b':
Change-Id: I4f87fca12c9b4d8c3e54a5fbb3cf8b991e0d2007
This commit is contained in: