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

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1