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

Change-Id: I52e47a1dec4e71c4002d2657cc99e712a39f8d34