Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: 2ac8c8a3e2
am: 24591d2641

Change-Id: Idc687ad7ea25b793f5ef12612e161e197d87679d