Merge "ui: Fix incorrect trackId usage" am: 86b18b837a

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1918191

Change-Id: If4ca615bcd137273228c5d8f80421efff31693b4