Merge "Remove lock inversion in LegacyVpnRunner"