DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 515e786cfd -s ours am: ef148edaa2 -s ours am: b6574912aa
am: 46ed74c3d3 -s ours
Change-Id: I07908e3f1734503e58bbf62586dbfc3a6c1f887a
This commit is contained in: