Merge "Change HFP Client API to support multi device" am: 01f2e67648
am: aaa490025b

Change-Id: I2e5a77ba5efece7af1d4be91ca795cd97e96acf3