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

Merge "Revert^12 "Enable dex container (DEX v41) for the whole system"" into main am: 9d96d1f1 am: 0eff90b3

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



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