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

Change-Id: Ib749ca5b2b97cf0d1e72edc71b9a639df52445b6