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

Change-Id: I6045e2a0793df21c5b3e5f0342393810da844c92