Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN" am: c07aed0f am: d471b98b am: 27ce3684 Change-Id: Idb5a89d644cedfda1f0e057dab6ee5d44726903a