[automerger skipped] Merge "Add ART's module-lib to "module_current"" into sc-dev am: d1ccddb7 am: f982f4d5 -s ours

am skip reason: Merged-In I435140f19a0f5a81310154728c828ac70e12192a with SHA-1 55bb7a64 is already in history

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

Change-Id: I819dfe06de1bf998c407aaa3a61b387e325130db