[automerger skipped] Merge "create library for mainline module" into...

[automerger skipped] Merge "create library for mainline module" into sc-mainline-prod am: 398ec632 -s ours

am skip reason: Merged-In I1bec7c7bdb25bf3397a742a356aa1f18fddf7d89 with SHA-1 a6fb9459 is already in history

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

Change-Id: I5d4e59a21c800553d7722d88abbbb0740753a18f