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

Change-Id: I897c48083f8e6786182d023c58f9861996c6d25c