Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2411e46a1c
am: 8166b7f309

Change-Id: I91754af34cafd8ea2924b6ccd84c1a65e77c165b