[automerger skipped] Merge "Update Contacts for guava 27.1" am: b239b66a45
am: 8e49eb44bc -s ours
am skip reason: change_id I5ea7810446ed23b133e6dfb0eb06e6e10125db53 with SHA1 a798701c6f is in history

Change-Id: Ie20c2545974dbaeaa5eb9bc8089ceabd5246ae2c