ui: Point stable to the cherry-pick of aosp/2049749
ui: Point stable to the cherry-pick of aosp/2049749

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