Merge "Revert^2 "Allow collecting diagnostics from shell commands"" into main am: d1713458a8

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

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