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

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

Change-Id: Ibd427e3a6dcffe43c21090a42f1799df3600a485