[automerger skipped] Merge "userdebug: support perfetto traces as a section in...
[automerger skipped] Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev am: cfff472c
am: d205ee21 -s ours
am skip reason: change_id Iaaa312d2d9da73ca329807211227a8c7a049102c with SHA1 cc7d9973 is in history
Change-Id: I5e9d65958cf4e0dad96dc60f84cf3545702f004a