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

Change-Id: Iab51b0aba9d9b5779328f0957962d3ff370aa2f4