Update stable channel to include a cherry-pick
Update stable channel to include a cherry-pick

Cherry-picked CL: https://r.android.com/2304058

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