Merge "Migrate from depreated Guava APIs" into ub-contactsdialer-h-dev
am: 00b9dc3490

Change-Id: Icbfa905a8913dab085f2e256f158f586b1d1673f