Merge "Fix kernelToTag import in NetworkStatsFactoryTest." am: d508855bb9

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

Change-Id: I8ed9e46023ad39c94e6a2392a6e013a7fd69044d