Merge "No-op cleanup of ConnectivityService." am: adf1a532f7
am: fd2a108d2a

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