Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2b am:...

Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2b am: 8f1a701b am: cb3836fe

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



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