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

Change-Id: I525ebc4b6c27eff17ff57fac7f664c221cbc2954