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