Merge branch 'master' into revertRoll

Revert "Roll src/third_party/catapult c9e75ab1ff47..b3788f22c908 (1 commits)"

This reverts commit 570f192d.

Reason for revert: run_benchmark fails
TBR=sadrul@chromium.org
Bug: chromium:1038690

Original change's description:
> Roll src/third_party/catapult c9e75ab1ff47..b3788f22c908 (1 commits)
>
> https://chromium.googlesource.com/catapult.git/+log/c9e75ab1ff47..b3788f22c908
>
> git log c9e75ab1ff47..b3788f22c908 --date=short --first-parent --format='%ad %ae %s'
> 2019-12-31 khokhlov@google.com Reland "Reland "[Telemetry] Make proto trace format the default""
>
> Created with:
>   gclient setdep -r src/third_party/catapult@b3788f22c908
>
> If this roll has caused a breakage, revert this CL and stop the roller
> using the controls here:
> https://autoroll.skia.org/r/catapult-autoroll
> Please CC rmhasan@google.com on the revert to ensure that a human
> is aware of the problem.
>
> To report a problem with the AutoRoller itself, please file a bug:
> https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
>
> Documentation for the AutoRoller is here:
> https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
>
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
> Bug: chromium:1028612
> Tbr: rmhasan@google.com
> Change-Id: Ifbffcda56802cd5b133a445bdfe9f552f34c898e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1984905
> Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/master@{#727871}

TBR=chromium-autoroll@skia-public.iam.gserviceaccount.com,rmhasan@google.com


Bug: chromium:1028612
Change-Id: I098e9df293c9f245ca664ffb15e3e3f2798afffa
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986025
Commit-Queue: Behdad Bakhshinategh <behdadb@chromium.org>
Reviewed-by: Behdad Bakhshinategh <behdadb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727999}

DEPS

@@ -238,7 +238,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '7c4300cb193f74ea6e0f04e1dbfca78b7140a241',
+  'catapult_revision': 'c9e75ab1ff4788c19a7b525fe3f35022b2f4a9b6',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.