[automerger skipped] Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to...

[automerger skipped] Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk." am: 72e0ffd9 am: 18cadf6a -s ours am: 7b199247 -s ours

am skip reason: Merged-In I771895bf0a974a4c6aa4f7374159c22536f03891 with SHA-1 66bb2ab3 is already in history

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

Change-Id: I75d2a8d6204db7299f09766e119fdf842eab81f5