Merge "Remove lock inversion in LegacyVpnRunner" am: 303762dc am: 9c142102 am: a97a1d61 am: 61560786 am: 1d17456f Change-Id: I73af97a1a672119267196ad3cdb540dd5ae28acc