Merge changes Ib24809ec,Id9d26435 into main

* changes:
  Remove the fail case on IPv6 in testLockdownVpn
  Remove LockdownVpnTracker from testLegacyLockdownVpn