Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev