Merge "resolve merge conflicts of b9d266ff to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: e61d3ff3
* commit 'e61d3ff3':
Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.
Change-Id: Ia6f1c88bba68df6660d7e91e4bedebda22bcf5c5