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

Change-Id: I29d41bc5ae4f6739301d0966c791830a35fc6f60