Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN"