Merge "Change HFP Client API to support multi device am: c8399321e9" into nyc-mr2-dev-plus-aosp