Reinstate most dumpsys sections in incident

This change reinstates most dumpsys sections in incident, because at
least one of these sections are being used by ABT (ODPM info for Battery
Historian). The dumpsys sections were originally removed because they
were being collected elsewhere in dumpstate.

The most expensive dumpsys section (meminfo, ~6 seconds) remains
omitted, so most of the improvements of aosp/2156679 should be retained.

Test: - atest incidentd_test
      - Capture bug report on an internal build and verify that ABT's
	Battery Historian tab contains ODPM rails.
Bug: 252586237
Change-Id: I3e1e5ebea6d6829cb3b70ddb70721878053eb7ca
diff --git a/cmds/incidentd/src/IncidentService.cpp b/cmds/incidentd/src/IncidentService.cpp
index 836801d..5af02f4 100644
--- a/cmds/incidentd/src/IncidentService.cpp
+++ b/cmds/incidentd/src/IncidentService.cpp
@@ -52,11 +52,7 @@
 #define SKIPPED_DUMPSTATE_SECTIONS { \
             1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, /* Logs */ \
             1200, 1201, 1202, /* Native, hal, java traces */ \
-            3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, \
-            3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3027, 3028, 3029, \
-            3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, \
-            3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 4000, \
-            4001, /* Dumpsys */ }
+            3018, /* dumpsys meminfo*/ }
 
 namespace android {
 namespace os {