Merge changes Ie9f01eed,I3acb8a0d am: fb769a1607 am: 316160b179

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

Change-Id: Ifd72680504e270d44284f524572049beead227e1