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

Change-Id: If5b3f6f1d397d3ac35b509a2e634a60933f2df6c
tree: dbbe55bea623fadcd1093e242d6a03e078d21dce
  1. core/
  2. services/
  3. tests/