Merge \"Guard concurrent accesses to BluetoothA2dp service object\" into nyc-mr1-dev
am: 30ec4f2732

Change-Id: Ie9bcb2474c002b8118666c413d864b05eaf0245c