perfetto_cmd: --ignore-guardrails effects service

Allow --ignore-guardrails to override enable_extra_guardrails (and
hence the traced side guardrails).

(cherry-pick of 3c678cb3e4484c028bdb354bcbee872ebdc1ae91 to fix a CTS test failure on tm-qpr-dev caused by fixing b/268320325)

Bug: 230096817
Merged-In: I60a280cfa8b4d5ad26f28cc023b408d87d3a5190
Change-Id: I60a280cfa8b4d5ad26f28cc023b408d87d3a5190

src/perfetto_cmd/perfetto_cmd.cc

diff --git a/src/perfetto_cmd/perfetto_cmd.cc b/src/perfetto_cmd/perfetto_cmd.cc
index 8c84802..aafc844 100644
--- a/src/perfetto_cmd/perfetto_cmd.cc
+++ b/src/perfetto_cmd/perfetto_cmd.cc
@@ -1002,8 +1002,9 @@
   }
 
   PERFETTO_DCHECK(trace_config_);
-  trace_config_->set_enable_extra_guardrails(save_to_incidentd_ ||
-                                             report_to_android_framework_);
+  trace_config_->set_enable_extra_guardrails(
+      (save_to_incidentd_ || report_to_android_framework_) &&
+      !ignore_guardrails_);
 
   // Set the statsd logging flag if we're uploading