Merge "Move some VPN logic out of ConnectivityService" am: ec86462033
am: e61a30f635

Change-Id: I00ab618139fdeba2374021657d84de4827ed97a2