Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am: 2411e46a1c

Change-Id: I4eb585b03fe5562603d7bec5756541cebdf6b767