Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into nyc-dev