Merge "Convert filegroup to library" am: dffbaaed39

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

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