Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am: cf1176073d

Change-Id: I1715c848fac8adfd41c7371a7103ea31bf4488ac