Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4
am: 184506a710

Change-Id: I6114e7b4617e7f23373434a54672497654d6d786