Merge "HFP: Using ConcurrentHashMap for mA2dpConnState" into q-keystone-qcom-dev