Merge "ConnectivityManager: simplify callback handler" am: 857e7d9c85 am: 7bce658dd6 am: a67fb638fa
am: a0dff338c0

Change-Id: I8d2373bfd1ae3fabab8f556d2b8c8cfa6310818c