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

Change-Id: I4ec5882184b9826a76d137d617ace141efec4695