Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 3e343ffd91

Change-Id: Id363cef8369d63ce4739089d94139e34ed25f665