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

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

Change-Id: I7dc3f917b38283eac67b7f9d2185355850857d52