ui: Release cherry picks onto stable
ui: Release cherry picks onto stable

Releasing contents of: aosp/1895224, aosp/1895223

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