Add dismiss button to new conversation guts

The fork was created before the new dismiss button was added, oops.

Fix: 407691861,405126528
Test: manual
Flag: android.app.notifications_redesign_templates
Change-Id: I50dd322c313a2552b02b6819476c9ed77716b107