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

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

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