Merge "Fix ConcurrentModificationException in GattService.onScanResult"