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 am: e38cd4da

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



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