Merge "Add padding between dial button and dialpad" am: 4a2c9b544a am: 1595f8c458
am: a18e49acf2

Change-Id: I2e232e75383cd5ae24c4a50103cabd54f5591bd9