Android S Preview 1
Merge changes I62c58967,I1dd57fa2

* changes:
  Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
  Stop using ConnectivityManager for VPNs.