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