Merge "Merge "Remove unused net-module-utils-srcs filegroup." am: 4b8edd89...

Merge "Merge "Remove unused net-module-utils-srcs filegroup." am: 4b8edd89 am: 6d338ccf am: acdb443a" into tm-d1-dev-plus-aosp am: bd3906c2

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



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