Merge "Revert "Set diagnostics log-data-type to CONNDIAG"" into main am: 0006d2ee51

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

Change-Id: Ida75e549c35d71efadb057fb7137e77da012e855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>