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

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

Change-Id: I408f1e9c65fed52e8a90596a7f19a7b2900a728d