[automerger skipped] Merge "Retire use_art_service_v2 flag and...

[automerger skipped] Merge "Retire use_art_service_v2 flag and dalvik.vm.features properties." into main am: ffe63966 am: f74d0bf3 -s ours

am skip reason: Merged-In I1663abe03d6a154a135263fab1b23239aac27688 with SHA-1 480b0baa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3007697



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