[automerger skipped] Merge "Add ART's module-lib to "module_current"" into...

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

am skip reason: Merged-In I435140f19a0f5a81310154728c828ac70e12192a with SHA-1 6b107a93 is already in history

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

Change-Id: Ic1ee512f76bafc994b12dba6f00cde272bafd89a