[automerger skipped] Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: cf1176073d am: 7886cfcf56
am: 340e84d3c8  -s ours

Change-Id: Ic38ae6fa438055d0b8f6cecbd8f008bc6469714b