Merge "HFP: Send caller ID in +CLIP command (4/4)"
am: 73bc27232b

Change-Id: I86e31e4eeb1a4c9c7e7f41c9e04143c331d9816f