Merge "Cleaning up logging in TelephonyManager." into m-wireless-dev