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

Change-Id: I1e6b88f38a1588d2d924383814c696e059662bf5