[automerger skipped] Merge "Remove modules-utils-build_system from filegroup" into sc-dev am: 9199dbc6 -s ours am: 7b284bca -s ours

am skip reason: Merged-In Ica496e67dd8b7c83aa93a512d06ad1a05d1c9c8d with SHA-1 452bfe1a is already in history

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

Change-Id: I6624c22b01eda504b84f547c0968d301f1a9a823