Merge "update guava library interface" am: 3e77f8da19 am: 4c4a890fb1 am: 401719c2ed

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

Change-Id: I196cbe0ce1cf6b7b56f2a306c019bc4b4992e530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>