Merge "AOSP/Dialer - Fix improperly formatted resource string in Dialer across many languages." am: 8910fde7dd
am: 8f9e253e97

Change-Id: I5c1b8b1d0e1060cc6393b119cd4addb1ba3de0cc