Merge "ConnectivityManager: simplify callback handler" am: 7739baa030 am: 7bce658dd6
am: a67fb638fa

Change-Id: I3934666df4a02101351993f7f83fb0a42124a2f5
tree: 56d0d309fbdcb229e047203b5c6132645438159e
  1. core/
  2. services/
  3. tests/