Merge "Update NetworkStackTests for jarjar usage" am: ed7cacebe5 am: 2ff0ecbd42 am: b09c2d3c91

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

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