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