Merge changes from topic 'am-20fc942671704f459c945a1b626498cb'
* changes:
Merge "Change HFP Client API to support multi device am: c8399321" into nyc-mr2-dev-plus-aosp am: 9ac9632e
Change HFP Client API to support multi device am: c8399321 am: 3978435d