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

Change-Id: I2f5fad0b559b972e82ecacdfcdd3805f0fbb2655