Merge "Move some VPN logic out of ConnectivityService"
am: 0ce38796bd

Change-Id: I212c2d6de1676ab65e6bbf34148d66e183d60c62
tree: de17946267cf7f203278675d034c9e6a0935bf10
  1. core/
  2. services/
  3. tests/