Merge "Revert^11 "Enable dex container (DEX v41) for the whole system"" into main

	if err != nil {

		ctx.PropertyErrorf("min_sdk_version", "%s", err)

	}

	if !Bool(d.dexProperties.No_dex_container) && effectiveVersion.FinalOrFutureInt() >= 35 {

		// V is 35, but we have not bumped the SDK version yet, so check for both.

		if ctx.Config().PlatformSdkVersion().FinalInt() >= 35 ||

			ctx.Config().PlatformSdkCodename() == "VanillaIceCream" {

			// TODO(b/329465418): Skip this module since it causes issue with app DRM

			if ctx.ModuleName() != "framework-minus-apex" {

				flags = append([]string{"-JDcom.android.tools.r8.dexContainerExperiment"}, flags...)

			}

		}

	}

	// If the specified SDK level is 10000, then configure the compiler to use the

	// current platform SDK level and to compile the build as a platform build.