Merge changes from topic 'am-20fc942671704f459c945a1b626498cb'

* changes:
  Merge "Change HFP Client API to support multi device am: c8399321e9" into nyc-mr2-dev-plus-aosp am: 9ac9632ed3
  Change HFP Client API to support multi device am: c8399321e9 am: 3978435d5a