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

Change-Id: I245d528bc6653d52de944732fceccb3c1d542c3c