Merge "Revert "Upgrade guava to v30.0"" am: 60d4589433

Original change: https://android-review.googlesource.com/c/platform/external/guava/+/1499096

Change-Id: Id5bbf622b5346a79b80f16c935440a225512d6c4