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

Merge "Revert^3 "Enable dex container (DEX v41) for the whole system"" into main am: 3d11d517 am: 96e84f84

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



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