[automerger skipped] Merge "Jarjar frameworks/libs/net in NetworkStack module"...

[automerger skipped] Merge "Jarjar frameworks/libs/net in NetworkStack module" am: b49b6c3d am: aa1ce01f -s ours am: 172e6aff -s ours am: 0e1d0da5 -s ours am: a6e7662a -s ours

am skip reason: Change-Id Id49fdf17fcf48a21455b7fe768ba046b81c51303 with SHA-1 e60b2150 is in history

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

Change-Id: I504244ad9c09a651c9208e218ea1c8715cd4a9a2