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

Change-Id: Id18998779551ba0f5a6faf2578dddd361b92570c