Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478
am: e5e819f078

Change-Id: I7f08217c5abc86a8784b91145f1b02d6693b3919