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

Change-Id: I50d31a50c8a0e01322e79fcd7a47f5883fe3feb4