Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: faed85f2b0
am: 331e50f601

Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919
tree: 22b284917630bc3be6899578206e8a1679ea518c
  1. core/
  2. services/
  3. tests/