Merge "Convert filegroup to library" am: dffbaaed39 am: 332131017f

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

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