Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-dr1-dev

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids