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

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

Change-Id: Ia2b5a9ac2c92084138733cc09664a546b2097012