Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi"
am: b5b0b321f6

Change-Id: I38532656d6abc4106399d14aa53230bf5b18f63b