Take optional fields into consideration when measuring

Also, move the padding to the icon so it's not dependent on an optional
view.

Bug: 123378871
Test: Do not set subtitle/description. Dialog layout looks normal now.
Change-Id: Ia6ae768660442aeaadeb09aa7117780b8a97d56f