Merge "Dialer: Fix proto warning with optmize for lite" am: c251a5b0e9

Change-Id: I6eb045fdf5882039980f7ede90a29c849a828628