Merge "Remove modules-utils-build_system from filegroup" am: a4d60ac1ee am: f46dc85e5a

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

Change-Id: Ib8693132319dc21d0a78f98e1dc74f2b6bca1790