Merge "Add tests for deleteKernelTagData" am: 8bf31e8061 am: d012f2948b

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

Change-Id: Ia2bda92c676ca823266a1631f7897078b86046f4