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

Change-Id: Ied4e9e0ff774c595eb5d82e184e8aa402e05529e