Merge "Switch on android.telecom.Log in Telecom"