DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 56260ed9cb -s ours am: ef148edaa2 -s ours am: 7135d5e6f2
am: d886103e29 -s ours
Change-Id: I07908e3f1734503e58bbf62586dbfc3a6c1f887a
This commit is contained in: