Merge "Transplant Logging to android.telecom" am: 6817ba9be2 am: e0a9727add
am: e7d6572db8

Change-Id: I35ba6f1e78f8f23a147d9af54c837d478ed05505