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

Change-Id: I14f46ad4b5e8a217a4222c720c670b195f4f5ec5