Merge "Revert "Updated dialer guava to V23 and autovalue to V1.5.2."" am: 33cbeb1429 am: 488fd98482
am: 6a4c72e06d

Change-Id: I52a8288b9c14a5f161f7509552eac6783dfc3a38