Merge "Fix ConcurrentModificationException on CachedBluetoothDevice"