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

Change-Id: I00b116082a4ea6f4af04909aa48a8d7651362014