[automerger skipped] Merge "Merge "statsd: Pass alert and config id to Perfetto" into pi-dev am: 66cb4e2871" into pi-dev-plus-aosp
am: 380d6781ca  -s ours

Change-Id: I71ae13da882900a5af18c0c556e338ff3a863d7b