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

Change-Id: Ia1047b019f4ee8844a2dc45be534747d5e799224