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

Change-Id: I04171173890b161c053c41a2a5c7e1602e510b8c