Merge "Use custom proto instead of debug string for perfetto traces" into main...

Merge "Use custom proto instead of debug string for perfetto traces" into main am: 725f8280 am: 284b93e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3160719



Change-Id: Ib0e255b18fde55705e425332b86bbf95a1676fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>