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

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

Change-Id: I26bc260ae6727e4e7d1a6053851681e0cee48631