Merge branch 'main' into dev/grendel/xxhash3

* main:
  [runtime] Remove the last vestiges of desktop builds (#8810)
  [ci] Don't auto-retry APK test suites. (#8811)
  [Microsoft.Android.Templates] Update EN l10n template strings (#8808)
  Bump to xamarin/Java.Interop/main@651de42 (#8809)

build-tools/automation/yaml-templates/apk-instrumentation.yaml

@@ -10,7 +10,6 @@ parameters:
   artifactSource: ""
   artifactFolder: ""
   condition: succeeded()
-  retryCountOnTaskFailure: 1
 
 steps:
 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
@@ -25,7 +24,6 @@ steps:
       -v:n -c ${{ parameters.configuration }} ${{ parameters.extraBuildArgs }}
     condition: ${{ parameters.condition }}
     continueOnError: true
-    retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
 
 - script: >
     DEST="$(Build.StagingDirectory)/Test${{ parameters.configuration }}/${{ parameters.artifactFolder }}/" &&

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.en.json

@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "Android Activity template",
+  "name": "Android Activity",
   "description": "An Android Activity class",
   "symbols/namespace/description": "namespace for the generated code",
   "postActions/openInEditor/description": "Opens Activity1.cs in the editor"

src/Microsoft.Android.Templates/android-layout/.template.config/localize/templatestrings.en.json

@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": "Android Layout template",
+  "name": "Android Layout",
   "description": "An Android layout (XML) file",
   "postActions/openInEditor/description": "Opens Layout1.xml in the editor"
 }