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

Change-Id: I8d5371b69fcec3f1f625923eb65191b4c018bb00