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
Change-Id: I7adf5398247687f0b2c0b7eba462f1c1e84548d7