Merge "Use Context.NETWORK_POLICY_SERVICE to get network policy service" am: 0daef81444 am: 6c76e04450

Change-Id: I6dd16740abbdfe46f1fe0fa34629a0c27f5cad32