Test: runtest -x com/android/settings/vpn2/VpnTests.java Change-Id: I45fa0509c56211602f6abd55a2f44cdf76f28829