Merge changes I90c211dc,I4455f272

* changes:
  ConnectivityServiceTest: more informative assert failures
  ConnectivityManager: allow usage of TYPE_NONE
tree: f12038e8526ddb3f31d1dd46c261102823dda7d2
  1. core/
  2. services/
  3. tests/