Merge "Revert "Remove unused net-module-utils-srcs filegroup."" am: 1ae7d624...

Merge "Revert "Remove unused net-module-utils-srcs filegroup."" am: 1ae7d624 am: 4dde1ee8 am: 76443bd3 am: d4470c4e am: 2b7fa770

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



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