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

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

Change-Id: I60785b009973468ea2564b3474d1e39c32e12e3d