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

Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
tree: 4ca5f7818bf42fc9d95848e588c53daaa5fea995
  1. core/
  2. services/
  3. tests/