tree b3453e87473ef8d87bddbf1cd43594cdf17cd9f7
parent a2c355cc18054ec03cabdfa9ed5e151f7c368816
parent de7f7447d587f2a34312ca9154b63474b6002147
author Lorenzo Colitti <lorenzo@google.com> 1608107372 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1608107372 +0000

Merge changes Ie0b32460,I21028457,I82754375

* changes:
  Allow ConnectivityServiceTest to change the calling UID.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Add tests for always-on VPN lockdown mode.