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

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

Change-Id: I1974744d7b8993db44733f524811876b78c9007a