am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev

* commit 'd3b6832edb5530b23132e054135c7fe93f5f9384':
  Match getLegacyVpn calls to changed interface