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

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

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

Change-Id: Ib6ad6bc54f3607c14fa0793c17ccb898007ec604