Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631 am: d496e9f60e

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

Change-Id: If31017208749d86b177572144a461004250a9d42