Merge changes I195c394b,Iff693cf6 am: b101eec5e1

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

Change-Id: I2a88f858acd6762b9d0b162abd419f62dccbee36