[automerger skipped] Use module_current for AOSP NetworkStack am: d8c1cba4...

[automerger skipped] Use module_current for AOSP NetworkStack am: d8c1cba4 am: 123cf3e6 -s ours am: e2699017 -s ours

am skip reason: Merged-In Ia55598123a5d4432464e9d1b1c637e9e0b58dd8e with SHA-1 71489ae4 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1729700

Change-Id: Ifd0a4c523d3e4b13585ad12e1c3bc8a9b3fde088