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

Change-Id: Icdbfb2971525d130223ac7a43bf3fec8304c13d5