[automerger skipped] Merge "Add Perfetto upload logging atoms" am: 07c402335a -s ours am: d9b11a283d -s ours
am: bf83edfc5f -s ours
am skip reason: change_id I8f41d72c8f96a004911ef68491de8a214da4db24 with SHA1 32a89c15a7 is in history

Change-Id: I4297d67765ef304142f0e10f5d6eee87b6d7e1bb