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