tree 682a85a0a8d8c91aea8d8cbe3528baf67d430604
parent 385f58bf7129b0003f6347096b1f13ef94be4748
parent 9ce4107f11009a8fa3078a9ea5b026f321b41ee3
author Lorenzo Colitti <lorenzo@google.com> 1612780892 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1612780892 +0000

Merge changes I4256ca5f,I91528e1a,I48bd594c

* changes:
  Change ConnectivityServiceTest to prepare for VPN code move.
  Add to VpnManager the VPN APIs used by Settings and SystemUI.
  Remove temporary hack in VpnTest.