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

Change-Id: I80a95aad9e732b2ce8aaddb296d40634627fdadb