am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

* commit '7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1':
  Revise lockdown check in getLegacyVpnInfo()