Merge remote-tracking branch 'origin/7.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350

src/plugins/android/androidmanager.cpp

@@ -517,6 +517,8 @@ QString AndroidManager::androidNameForApiLevel(int x)
         return QLatin1String("Android 12");
     case 32:
         return QLatin1String("Android 12L");
+    case 33:
+        return QLatin1String("Android 13");
     default:
         return tr("Unknown Android version. API Level: %1").arg(x);
     }