Merge "Update Contacts for guava 27.1" into qt-dev-plus-aosp
am: f1ebf0608e

Change-Id: I4f618390d3c302498a13e38cf79cb7db9a82b200