diff --git a/external/Java.Interop b/external/Java.Interop
index faee0da184d..c5e1b92ac1f 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit faee0da184d57f9c3f158b4a78b7109e453f97a6
+Subproject commit c5e1b92ac1fa95df5bc44202fb5b6528ccb020e9
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
index 70feb73d062..b8494d1ccac 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
@@ -474,6 +474,17 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
 			proj.SetProperty ("XamarinAndroidSupportSkipVerifyVersions", "True"); // Disables API 29 warning in Xamarin.Build.Download
 			proj.SetProperty ("AndroidPackageFormat", packageFormat);
 			proj.SetProperty ("TrimmerSingleWarn", "false");
+			
+			// Add test code for: https://github.com/dotnet/android/issues/10509
+			proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}",
+				"""
+					// These should not cause warnings
+					new FrameLayout (this).Foreground = null;
+					new ListView (this).Adapter = null;
+					Console.WriteLine (Android.Provider.MediaStore.Video.IVideoColumns.DateTaken);
+					Console.WriteLine (Android.Provider.MediaStore.Images.IImageColumns.DateTaken);
+				""");
+
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Forms/MainActivity.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Forms/MainActivity.cs
index 67f0bc43bf1..54bceb11b78 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Forms/MainActivity.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Forms/MainActivity.cs
@@ -22,7 +22,7 @@ protected override void OnCreate (Bundle savedInstanceState)
 			global::Xamarin.Forms.Forms.Init (this, savedInstanceState);
 			//${AFTER_FORMS_INIT}
 			LoadApplication (new App ());
+			//${AFTER_ONCREATE}
 		}
-		//${AFTER_ONCREATE}
 	}
 }