[automerger skipped] Merge "Remove modules-utils-build_system from filegroup"...

[automerger skipped] Merge "Remove modules-utils-build_system from filegroup" into sc-dev am: 9199dbc6 am: 4c0b867d -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: I36ae01857b9a828187cb90019100ab09b3c9b558