Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService."