Merge branch 'main' into tune-runtime-cpp

* main:
  [Mono.Android] nullability for AndroidMessageHandler.RequestNeedsAuthorization (dotnet#7454)
  [Xamarin.Android.Build.Tasks] Fix up `ToJniName` to use `cache`. (dotnet#7460)
  Bump to xamarin/android-api-docs@52d85154 (dotnet#7459)
  Bump to xamarin/xamarin-android-tools/main@9f56dec (dotnet#7456)

Author: grendello

external/android-api-docs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -233,6 +234,9 @@ public int MaxAutomaticRedirections
 		/// If <c>true</c> then the server requested authorization and the application must use information
 		/// found in <see cref="RequestedAuthentication"/> to set the value of <see cref="PreAuthenticationData"/>
 		/// </summary>
+#if NETCOREAPP
+		[MemberNotNullWhen(true, nameof(RequestedAuthentication))]
+#endif
 		public bool RequestNeedsAuthorization {
 			get { return RequestedAuthentication?.Count > 0; }
 		}

external/xamarin-android-tools

@@ -336,7 +336,7 @@ public IList<string> Merge (TaskLoggingHelper log, TypeDefinitionCache cache, Li
 				if (PackageName == null)
 					PackageName = t.Namespace;
 
-				var name        = JavaNativeTypeManager.ToJniName (t).Replace ('/', '.');
+				var name        = JavaNativeTypeManager.ToJniName (t, cache).Replace ('/', '.');
 				var compatName  = JavaNativeTypeManager.ToCompatJniName (t, cache).Replace ('/', '.');
 				if (((string) app.Attribute (attName)) == compatName) {
 					app.SetAttributeValue (attName, name);
@@ -927,7 +927,7 @@ void AddInstrumentations (XElement manifest, IList<TypeDefinition> subclasses, i
 
 			foreach (var type in subclasses)
 				if (type.IsSubclassOf ("Android.App.Instrumentation", cache)) {
-					var xe = InstrumentationFromTypeDefinition (type, JavaNativeTypeManager.ToJniName (type).Replace ('/', '.'), targetSdkVersion);
+					var xe = InstrumentationFromTypeDefinition (type, JavaNativeTypeManager.ToJniName (type, cache).Replace ('/', '.'), targetSdkVersion);
 					if (xe != null)
 						manifest.Add (xe);
 				}

src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs

@@ -142,7 +142,7 @@ public bool Generate (bool debugBuild, bool skipJniAddNativeMethodRegistrationAt
 				return GenerateDebug (skipJniAddNativeMethodRegistrationAttributeScan, javaTypes, cache, typemapsOutputDirectory, generateNativeAssembly, appConfState);
 			}
 
-			return GenerateRelease (skipJniAddNativeMethodRegistrationAttributeScan, javaTypes, typemapsOutputDirectory, appConfState);
+			return GenerateRelease (skipJniAddNativeMethodRegistrationAttributeScan, javaTypes, cache, typemapsOutputDirectory, appConfState);
 		}
 
 		bool GenerateDebug (bool skipJniAddNativeMethodRegistrationAttributeScan, List<TypeDefinition> javaTypes, TypeDefinitionCache cache, string outputDirectory, bool generateNativeAssembly, ApplicationConfigTaskState appConfState)
@@ -186,7 +186,7 @@ bool GenerateDebugFiles (bool skipJniAddNativeMethodRegistrationAttributeScan, L
 					modules.Add (moduleName, module);
 				}
 
-				TypeMapDebugEntry entry = GetDebugEntry (td);
+				TypeMapDebugEntry entry = GetDebugEntry (td, cache);
 				HandleDebugDuplicates (javaDuplicates, entry, td, cache);
 				if (entry.JavaName.Length > module.JavaNameWidth)
 					module.JavaNameWidth = (uint)entry.JavaName.Length + 1;
@@ -227,7 +227,7 @@ bool GenerateDebugNativeAssembly (bool skipJniAddNativeMethodRegistrationAttribu
 			foreach (TypeDefinition td in javaTypes) {
 				UpdateApplicationConfig (td, appConfState);
 
-				TypeMapDebugEntry entry = GetDebugEntry (td);
+				TypeMapDebugEntry entry = GetDebugEntry (td, cache);
 				HandleDebugDuplicates (javaDuplicates, entry, td, cache);
 
 				javaToManaged.Add (entry);
@@ -300,10 +300,10 @@ void PrepareDebugMaps (ModuleDebugData module)
 			}
 		}
 
-		TypeMapDebugEntry GetDebugEntry (TypeDefinition td)
+		TypeMapDebugEntry GetDebugEntry (TypeDefinition td, TypeDefinitionCache cache)
 		{
 			return new TypeMapDebugEntry {
-				JavaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td),
+				JavaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td, cache),
 				ManagedName = GetManagedTypeName (td),
 				TypeDefinition = td,
 				SkipInJavaToManaged = ShouldSkipInJavaToManaged (td),
@@ -330,7 +330,7 @@ string GetManagedTypeName (TypeDefinition td)
 			return $"{managedTypeName}, {td.Module.Assembly.Name.Name}";
 		}
 
-		bool GenerateRelease (bool skipJniAddNativeMethodRegistrationAttributeScan, List<TypeDefinition> javaTypes, string outputDirectory, ApplicationConfigTaskState appConfState)
+		bool GenerateRelease (bool skipJniAddNativeMethodRegistrationAttributeScan, List<TypeDefinition> javaTypes, TypeDefinitionCache cache, string outputDirectory, ApplicationConfigTaskState appConfState)
 		{
 			int assemblyId = 0;
 			var knownAssemblies = new Dictionary<string, int> (StringComparer.Ordinal);
@@ -373,7 +373,7 @@ bool GenerateRelease (bool skipJniAddNativeMethodRegistrationAttributeScan, List
 					tempModules.Add (moduleUUID, moduleData);
 				}
 
-				string javaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td);
+				string javaName = Java.Interop.Tools.TypeNameMappings.JavaNativeTypeManager.ToJniName (td, cache);
 				// We will ignore generic types and interfaces when generating the Java to Managed map, but we must not
 				// omit them from the table we output - we need the same number of entries in both java-to-managed and
 				// managed-to-java tables.  `SkipInJavaToManaged` set to `true` will cause the native assembly generator