Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev