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

Change-Id: Icaff0e2cc4ebeb1f36b8597ee11457779aeca06f