Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd26 am: 84d00a4f

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



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