Merge "ConnectivityManager: unify prety printing of callback types." am: 0a4dc6a5d2
am: 3a0e92fada

Change-Id: Ie639f2c9685f19ef00ddb4ac937e6e9576998b80