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

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

Change-Id: I865ceade7e2c45b3a4e436b52b9dd220a878116b