Merge changes Ie9f01eed,I3acb8a0d am: fb769a1607

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

Change-Id: I8c49bfe9a5baeb9794ceb7b316f87ab83ae09c22