Underp the dialpad buttons

 * Fix weirdo button that joined us with a bad merge

Change-Id: Id54a5883d0fca789f8f53a851363d6eda2aae6af
Revert "Underp the dialpad buttons"

This reverts commit f46c62424361ba5aced620433baefb12ee4bf2d4.

Change-Id: I2e875a0ae86495ae14fef4bbc292ec80883e8914
InCallUI: Code cleanup

(Yes, this is a dumb commit lol)

Change-Id: Id9dc511d292e96bcda8f575bf393baa5cc4e163b