Merge "statsd: Pass alert and config id to Perfetto" into pi-dev
am: 66cb4e2871

Change-Id: Ia60905455eea9434f63435a0c6fd04276299e927