Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69 am: 23ee1621c7 am: b51307e12e
am: 7b8fc6ea79

Change-Id: Ic919f56d9aca75842129f96d0b5b75b53c1e9fd8