dumpstate: Include Citadel status in all bugreports

Gather Citadel's firmware version, uptime stats, and motherboard type in all
bug reports. None of this can be used to identify a specific phone, so it's
safe to run in production builds.

Previously we were running --id and --selftest. Because these could be used
to indentify a specific Citadel chip, we only gathered it on userdebug and
test builds. We used that to isolate problems with early Citadel samples in
prototype phones, which we've done, fixed, and replaced. We don't need that
info anymore.

Bug: 141235263
Test: manual
Change-Id: I536aa53b65063be7721a7f6cd460eb53779a50d6
Merged-In: I536aa53b65063be7721a7f6cd460eb53779a50d6
Signed-off-by: Bill Richardson <wfrichar@google.com>
(cherry picked from commit 3e00c669628417e4689a75baa6f9b4b0ecb019da)
(cherry picked from commit 3f7402d8a847aceed47b65e13a178b41db624f43)
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 6a6ade1..90a6221 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -393,6 +393,11 @@
         dumpModem(fd, fdModem);
     }
 
+    // Citadel info
+    RunCommandToFd(fd, "Citadel VERSION", {"/vendor/bin/hw/citadel_updater", "-lv"});
+    RunCommandToFd(fd, "Citadel STATS", {"/vendor/bin/hw/citadel_updater", "--stats"});
+    RunCommandToFd(fd, "Citadel BOARDID", {"/vendor/bin/hw/citadel_updater", "--board_id"});
+
     // Keep this at the end as very long on not for humans
     DumpFileToFd(fd, "WLAN FW Log Symbol Table", "/vendor/firmware/Data.msc");