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

Change-Id: Ic07c1f2ffb5fc40339058ebbe22112240d46f6fe