Merge "Revert^2 "Remove unused net-module-utils-srcs filegroup."" am:...

Merge "Revert^2 "Remove unused net-module-utils-srcs filegroup."" am: f15b1ffd am: 251adfb3 am: f2441f60 am: fc3ee873 am: fca845df

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



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