Merge "Add permission check to setAllowOnlyVpnForUids" into pi-dev