[automerger skipped] Merge "Add ART module-lib and system API to the...

[automerger skipped] Merge "Add ART module-lib and system API to the collection" into sc-dev am: c92d1a5e am: 5a3b4d06 -s ours

am skip reason: Merged-In Icae91fd724dd1f827a61e0a7a248fd1db8532e53 with SHA-1 d21107a1 is already in history

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

Change-Id: I57a43759e93cb4eebb6d389db457e06373143de6