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

Change-Id: Ica9d4fbb1dd0ba9da4aaea0fbc3571c3446110ef