[automerger skipped] Merge "Revert "Add Perfetto upload logging atoms"" am: bab05b054d -s ours am: 19530a42f1 -s ours
am skip reason: Change-Id I8f41d72c8f96a004911ef68491de8a214da4db24 with SHA-1 32a89c15a7 is in history

Change-Id: I293ea9561d96322e25a281af640d0eb53d3b1521