Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2ac8c8a3e2 am: 24591d2641
am: 94405bb133

Change-Id: Ie2dd54ebdd4cd71ca89d263ec738f6c4a90cfac7