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

Merge "Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734 am: e1dd0563" into udc-qpr-dev-plus-aosp am: 506211ba

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



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