Merge "Transplant Logging to android.telecom"