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

Change-Id: Ieef0b8d98b43cc3897bec8cca0bbe223f510a7d6