Merge "Move jarjar rules from NetworkStaticTestsLib to NetworkStaticTests" am: 1ff8540099 am: 25f3ab0fec

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1473856

Change-Id: I419eeed036c7d2997ce2dfb2846faea1372007bf