Merge "Dialer: Fix proto warning with optmize for lite" am: c251a5b0e9 am: 33e47c33df am: 6295a8e3c5 am: df82c1c210 am: 1e1d86716e

Change-Id: I4395e7dc9c871ec909658ff7b8e67afafbab7b5e