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

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1
tree: d0b9ea58e3c5b33ebdfd3788284acde0207b9d8d
  1. core/
  2. services/
  3. tests/