DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 4983e55853 -s ours am: ef148edaa2 -s ours am: c869826359
am: d51cb6eb83 -s ours
Change-Id: I07908e3f1734503e58bbf62586dbfc3a6c1f887a
This commit is contained in: