[automerger skipped] Merge "Remove Context.NETWORK_POLICY_SERVICE from @SystemApi" am: acacd719 am: bc10b501 -s ours am: d95521f3 -s ours am: d7772d60 -s ours am: 3add34e0 -s ours

am skip reason: Change-Id I0586a5ef22f76fa1407219b96cb246f162f02947 with SHA-1 cd44942a is in history

Change-Id: I5f8f4f3882e3b6d0661e78390ae64f85a5e592d8