Merge "Change data types on CallIdentification API." am: 016982ae2f
am: d29c7d63a2

Change-Id: I902f8f14350567973ab007b407bfe72ef90c2b2d