Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService."
am: 7211131e23

* commit '7211131e238920db03c83f0c2c21f3c135a7e44f':
  Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.

Change-Id: Ifd70b0232fba8d1c8fe2e87b2ca95985d3c0681c