[automerger skipped] Merge "Add call Id information to call log provider." am: 04134edaaf am: d64bcf2a5f
am: 98466ba5c7 -s ours
am skip reason: change_id I1c41c89e0fd414cb4dbe4a90f8aa3721186381e3 with SHA1 b246f40239 is in history

Change-Id: Ib0b3ea3c9f5d7bb2435552ae0667597d884bddcd