Android n mr1 preview 1
Merge "Transplant Logging to android.telecom"