Merge "Allow perfetto to ingest logs on userdebug/eng"