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

Merge "Revert^2 "Enable dex container (DEX v41) for the whole system"" into main am: 8e1efb7f am: c65e4210

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



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