Merge "Adjust weights of layouts on the dialpad so that key letters aren't clipped." am: 0835c254f2
am: a1bfe7c058

Change-Id: I1e9afe9f0a076cf90607bf5748fb3db2046e8ad4