Merge "Remove unused references to android.app.ActivityThread in BluetoothAdapter"