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

Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
tree: bba4046a14f54e09f60fd30ed74f5d65bf48dba8
  1. core/
  2. services/
  3. tests/