Merge "Guard concurrent accesses to BluetoothA2dp service object" into nyc-mr1-dev