Merge "Revert "Log BPF programs & maps in bugreport"" am: afebcc8608

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

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