Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096 am: 19f3aab438 am: ef2f29d2b3 am: f579e8f3f2

Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030

Change-Id: I2a22bd216231dfb722e35d13f5c18f5b39563599