Merge "2-phase initialization of NetworkPolicyManagerService"