[automerger skipped] Merge "Revert "Add Perfetto upload logging atoms"" am: bab05b054d -s ours
am: f11e43e171 -s ours
am skip reason: change_id I8f41d72c8f96a004911ef68491de8a214da4db24 with SHA1 32a89c15a7 is in history

Change-Id: I2454a74ce85e588b4bbf3f3b642b005d034cb9ad