Merge "Remove Context.NETWORK_POLICY_SERVICE from @SystemApi" into rvc-dev am: 9f48409dd1

Change-Id: I3ae448700788772b6c5d7e33e8e01ac53fc35c1d