Merge "Revert^10 "Enable dex container (DEX v41) for the whole system"" into main am: acd02251

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



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