Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: cf1176073d
am: 7886cfcf56

Change-Id: I6a742cb541d072338707b5b611f9afc7f541275f