Merge "Handle lockdown VPN reset intent in ConnectivityService"