Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am: 2ac8c8a3e2

Change-Id: I8836294e7206c8e8c024f5b986c25b9cf2dd29d9