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: 31999163

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



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