Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev