Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN" am: c07aed0fd4
am: d471b98baa

Change-Id: Ia5bcd39c177c650a4e0174fc69d5078bc12b9e4c