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

Change-Id: I872335359a103a742fe9c49c8fe7ad969ddee986