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

Change-Id: Idb5a89d644cedfda1f0e057dab6ee5d44726903a