Merge "HFP: Send caller ID in +CLIP command (2/4)" am: 3d40d820bb
am: 4e7748f8a9

Change-Id: Ifc22f8e0874dd451aff41ee34937b180c7a52e50