[automerger skipped] Merge "Reland Perfetto upload logging atoms DO NOT MERGE" am: 54eb3077e8 am: ed1ecfd616 -s ours
am: 629e06c2cc -s ours
am skip reason: subject contains skip directive

Change-Id: Ib456dffe3990f78c0866d07133cae06d7ea595c1