Merge "Reland Perfetto upload logging atoms DO NOT MERGE"
am: 54eb3077e8

Change-Id: I9258542033c1596402aea9d6dd8367eb954295b5