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

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

Change-Id: I11d8c0afca08ecb04c81a4dffe1604ef79707c78