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

Change-Id: I64e18346d869594db31f3e7fa3154bb9198a3790