Merge "ConnectivityManager: allow custom Handlers" am: ef69246260 am: cb47118af1
am: 0f99e5367b

Change-Id: I9f7fc64c2d3d6f88344c9547b8e1ac17cf3d1104