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

Change-Id: I43efafcb80a85f0cb94037440e66a2568b71af63