Merge "Adjust NetworkStatsServiceTest to mock out the JNI." am: c5ad7cd775 am: 257a7018d5

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

Change-Id: I06adf3d0cf32243d9c153551e757fd8cda893ebb