Add dismiss button to new templates

The original templates were modified after the new ones were forked.
This should bring them back to parity.

See also I82e96c7e12d07929242e0c0033e8562cb58fbfd9 that this is based
on.

Bug: 378660052
Test: TBD
Flag: android.app.notifications_redesign_templates
Change-Id: I4f1a95d98268b4c07f43f0f28df7757122321c31