Merge "No-op cleanup of ConnectivityService."
am: a706027ff9

Change-Id: I9ec9633a85b8b2298f90419da2a73c540b6e6805
tree: 407c57d9b7a93a361232454175b507febf618121
  1. core/
  2. services/
  3. tests/