GitLab

See https://chromium-review.googlesource.com/c/chromium/src/+/1830506

-Update build.gn dependencies for androidx update.
-Change an import for androidx annotations that should have been
when all other annotation imports were migrated to androidx.

Bug: 896775
Change-Id: Ie22118da7841fac029aee37a5c1d10b78325b87e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036407Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#738426}