Merge "Remove screen lock requirement from VPN test"