[automerger skipped] Merge "Remove lock inversion in LegacyVpnRunner" into...
[automerger skipped] Merge "Remove lock inversion in LegacyVpnRunner" into rvc-dev am: a2fe5f75 am: 61d3e5bc -s ours
am skip reason: Change-Id I51a475f575252fb981641fc6240bb8c15576c5f2 with SHA-1 144829b1 is in history
Change-Id: Ia60de41d43a273c82367fbde8850a4bd90c51af8