Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd26 am: 4f0489ae

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



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