Merge "Remove BluetoothFeatureProvider and impl"