Merge changes from topics "dialer-account-suggestion-3", "dialer-account-suggestion-2"
am: 9efa0d8b82

Change-Id: I671499926fb0c9cdf5d816d31f7d865fe0916473