tree 1242ef97230bd70885650d7c492a1c0c0c125ddc
parent bc878b6a4d4548301f514d01ff72222231f32d82
parent 5b90ebaf4d9edefcd9648b46cd0226f882169476
author TreeHugger Robot <treehugger-gerrit@google.com> 1612422115 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1612422115 +0000

Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev

* changes:
  Fix legacy APIs when VPN switches to suspended underlying network.
  Backport test coverage from aosp/1547496.
  Backport some helpers in ConnectivityServiceTest.
  Test for bugs with suspended VPN underlying networks.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Improve testing of CONNECTIVITY_ACTION broadcasts.
  Test passing an underlying network array with null network in it.
  Make testVpnNetworkActive more deterministic.
  Make MockVpn more realistic and easier to use.
  Increase test coverage for VPN info sent to NetworkStatsService.
  Simplify MockVpn.
  Test a VPN with an underlying network that does not yet exist.