Hansen Kurli ccfc52145b Merge changes I22d67a7e,Ida4a4bc7,Ie8522862,Id55d8d6c into main ...

* changes:
  Ensure nri is satisfied before returning.
  Add testLockdownVpn that mocks platform VPN.
  Make variables in testLegacyLockdownVpn() final.
  Update testLegacyLockdownVpn to mock VPN.

2023-10-13 05:00:29 +00:00

..

android

Merge "Disable the remaining VPN CTS tests on watches." into main

2023-10-03 16:39:31 +00:00

com/android

Merge changes I22d67a7e,Ida4a4bc7,Ie8522862,Id55d8d6c into main

2023-10-13 05:00:29 +00:00