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

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



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