Merge "Bluetooth: remove BluetoothDiscoveryReceiver"