[automerger skipped] Merge "Use Context.NETWORK_POLICY_SERVICE to get network policy service" am: 0daef81444 am: 6c76e04450 am: 75f4c6c49a -s ours
am skip reason: Change-Id I41bc1cce08f81e2d822250f2d620bff7afe4329b with SHA-1 7e96360554 is in history

Change-Id: I89b2c99f4bfe71e01b97d6d082da6d9fad3f1194