Fix search within engine tracks with multiple track ids
Fix search within engine tracks with multiple track ids

Previously search only examined tracks with a single track stored in
trackId but for many tracks, this isn't present but trackIds exists and
was being ignored.

This makes it checks trackIds first before falling back on trackId.

Change-Id: I30e173f6b1999f1b1874b4e346384168166a6706
google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto