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

Change-Id: Ie6a29fc3595b3a417c823b03d6bf20597264c8fd