Merge "[automerger skipped] Merge "Remove lock inversion in LegacyVpnRunner"...

Merge "[automerger skipped] Merge "Remove lock inversion in LegacyVpnRunner" into rvc-dev am: a2fe5f75 am: 61d3e5bc -s ours" into rvc-d1-dev-plus-aosp am: 88c4a715 -s ours

am skip reason: Change-Id I51a475f575252fb981641fc6240bb8c15576c5f2 with SHA-1 144829b1 is in history

Change-Id: I37a467bd84ef51bd88828b8fcc61f5af891bc36f