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

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

Change-Id: If41fe23391b30992b12b8b37593442e2f6cb1906