Merge "Convert filegroup to library" am: dffbaaed am: 33213101 am: 8edb229d am: b78f190b

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



Change-Id: I73e30c87c1e05f9d31855e3b2caca15f0009eacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>