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

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

Change-Id: Iabaf47adf7cbb0f91d4bf36a4f85e69fb0952c04