Merge "Implement multi-hfp APIs"
am: 783a0cf268

Change-Id: If6f52a9cfe83bd7bcd338a184fad82b49c3eac91