Merge changes from topics "disable-art-service-dexopt",...

Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734 am: e1dd0563

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



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