Merge "Add more information to incident header. Especially add config keys to check...

diff --cc Android.mk
Simple merge

diff --cc cmds/statsd/src/anomaly/AnomalyTracker.cpp
index 9b65acf,39a19a3..e34aed3
--- 1/cmds/statsd/src/anomaly/AnomalyTracker.cpp
--- 2/cmds/statsd/src/anomaly/AnomalyTracker.cpp
+++ b/cmds/statsd/src/anomaly/AnomalyTracker.cpp
@@@ -18,8 -18,8 +18,9 @@@
  #include "Log.h"
  
  #include "AnomalyTracker.h"
 +#include "external/Perfetto.h"
  #include "guardrail/StatsdStats.h"
+ #include "frameworks/base/libs/incident/proto/android/os/header.pb.h"
  
  #include <android/os/IIncidentManager.h>
  #include <android/os/IncidentReportArgs.h>