Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
am: a9df845321

Change-Id: I0d7f4421d10f977eb9071ba3478da771e58541ca