Merge "Merge "Allow perfetto traces to collected from user builds." into...
Merge "Merge "Allow perfetto traces to collected from user builds." into rvc-dev am: d507d09c am: 3f84cf3b" into rvc-d1-dev-plus-aosp am: 7cdc17e7 am: 9404be6b
Change-Id: I1db35e54b8495fafc57869c5c0a7167a7500222d