Merge "Jarjar frameworks/libs/net in NetworkStack module" into rvc-dev am: def2536afa am: 83a1744ce7 am: f978cfbc93

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

Change-Id: I32708fdf9f0bf1561a6be7d17dd145da7e2ce956