Merge "Update padding for emergency dialpad buttons" am: 92702d3799 am: 07aaecccba

Change-Id: I2a9e648423204192c81c59079a0dd3004455ed5c