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

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

Change-Id: Id7f6bf515fc4a25262b4809b64a5d0a9da769f5e