Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev
tree: 0500f681bfa2ed0cf6d6bf3550e0aa21bd4fc30e
  1. core/
  2. services/
  3. tests/