[automerger skipped] Merge "Migrate NetworkStack modules to use modules-utils"...

[automerger skipped] Merge "Migrate NetworkStack modules to use modules-utils" into sc-mainline-prod am: f580c95e -s ours

am skip reason: Merged-In I6de6c2575adf896e283672ebae82431f5c8172af with SHA-1 b05beb46 is already in history

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

Change-Id: I4340f4a9ce3be739d7980f1aa854abd1ec428180