Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService."
am: 7211131e
* commit '7211131e':
Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.
Change-Id: Ifd70b0232fba8d1c8fe2e87b2ca95985d3c0681c