Merge "Rename for updating BluetoothA2dp API naming"