These also cause ConnectivityCoverageTests to fail when built from master and run on S. They are used in Vpn.java, not LockdownVpnTracker. They were not addressed in the previous CL because running this test locally is difficult. Test: forrest Change-Id: I7d687338fd6bc7468b1abcae58898322554e647b