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