Merge "Add tests for deleteKernelTagData" am: 8bf31e8061 am: e6fd9ce504 am: 2668a2fb7a

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

Change-Id: I773eb4a44cb86016cb79ce4da2df48db6976a6b0