Merge "Update NetworkStackTests for jarjar usage" am: ed7cacebe5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2057198 Change-Id: I0b4dc2ccda0ceda08d56afeb08f5f17ef7ca1588 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>