Merge "Merge changes I31d5260d,Ied92f558 into nyc-dev am: a5e65539 am:...
Merge "Merge changes I31d5260d,Ied92f558 into nyc-dev am: a5e65539 am: 31b3676c" into nyc-mr1-dev-plus-aosp
am: fbde3272
* commit 'fbde3272':
Start VPN as early as possible during startup
Split network agent created state from connected state
Change-Id: I6e1d6a1977db342f45a1a9114a56c181540e12bf