Manually roll catapult + fix pydeps + make some changes to devil_util

This CL is part of a two-sided patch and will be submitted alongside
https://chromium-review.googlesource.com/c/catapult/+/6479254

This CL makes a manual roll of the catapult repository.

This CL also fixes some pydeps files that are no longer up-to-date
as a result of the above CL.

This CL also makes some changes to devil_util to make it compatible
with the changes in the above CL.

Bug: 397459590
No-Try: true
Change-Id: I58d88d7dce8760b0d2f14d116cb087684f362e92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6480814
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Martin Kong <martinkong@google.com>
Cr-Commit-Position: refs/heads/main@{#1451188}