Merge "Switch on android.telecom.Log in Telecom" am: 37521b9ba5  -s ours am: ce21e3ffa8
am: 0fcc717ed9

Change-Id: I0d03c1dccfee9ffe7b8c6f44f6bdbfb876c11d21