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

Change-Id: I12cdcac2581a062313dfc0c854a184485f5fc718