Merge "Implement multi-hfp APIs" am: 783a0cf268 am: 1f41ff90b5
am: f4d3ddfc94

Change-Id: Id2030078424c7b800c23ebceee2a770a60f5b571