Merge "Convert filegroup to library" am: dffbaaed am: 33213101 am:...

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

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



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