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

Change-Id: Idb4c45a15b082e72a161f2a70e8c1b75c1b369bd