Merge "Update VpnManagerServiceTest to work with lockdown VPN main user changes."