Merge changes Ib7883f8a,I91ec59f7 into main

* changes:
  Mock Vpn.setUnderlyingNetworks()
  Mock Vpn.setLockdown()