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

Change-Id: Ib9b33541a9679a6001fbeacb23d687cfb1a0740a