Merge "Cleanup TelephonyManager's log" am: 033de4676b am: 22f61111bd
am: bfb00f97af

Change-Id: Iccc3d497bf28906f4da54eef3acbd72dc04bfd3c