Merge changes Ia0e1b307,I63c7c33e into main am: a5289ac9ef am: 903a500065

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216639

Change-Id: I21ed0479f96986058353f5942ebc1030547eab48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

java/testing.go

@@ -543,6 +543,16 @@ func gatherRequiredDepsForTest() string {
 			},
 			compile_dex: true,
 		}
+		java_library {
+			name: "framework-minus-apex",
+			srcs: ["a.java"],
+			sdk_version: "none",
+			system_modules: "stable-core-platform-api-stubs-system-modules",
+			aidl: {
+				export_include_dirs: ["framework/aidl"],
+			},
+			compile_dex: true,
+		}
 
 		android_app {
 			name: "framework-res",