Merge "Add permission check to setAllowOnlyVpnForUids" am: 1fb2ed3de3 am: 1efa51a873
am: d71467740b

Change-Id: I1fe555d14eef009608b41f0ca8a3e9ceac36cda4