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

Change-Id: I0e8fe0754588fc162482275f05d8aef9a8d97711