Move padding back into to the dialog message

Makes lists look weird, but we need some dynamic adjustment of padding
if we're going to handle every combination of buttons/message/etc.

BUG: 17460357
Change-Id: I2990f72f3761f3a0e9cf5d295101af2b99685cff