Merge "Add permission check to setAllowOnlyVpnForUids"
am: 1fb2ed3de3

Change-Id: I3a529eecf98a19c8ab421707fc952b2a56e10f34