Merge changes from topic "am-2e871200-b617-48ec-aaec-be10bd356e72" into q-keystone-qcom-dev

* changes:
  [automerger] HFP: Using ConcurrentHashMap for mA2dpConnState am: e3d25a6956
  HFP: Using ConcurrentHashMap for mA2dpConnState