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

Change-Id: If6b40f4f2aa77c38c656bc3731773aad360c5287