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

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

Change-Id: I5461a9c08a9181af95880a4e738ede681fdb9c13