Merge "ConnectivityManager: remove obsolete callback types"
am: 458f75ef69

Change-Id: I180b5ae5890172f14dd910ce3ef3d1c907e3475b