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

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

Change-Id: I9d94a97c64bf9c7aa9a55e244e37dbc8c32bfcc0