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

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

Change-Id: Ic028cdd0d1a6d9d99b303ebb29760375db515bcb