Merge "Resolve BluetoothA2dpSink APIs used by Settings"