base

Pipe the dismiss button logic through the touch handler.

- This ensures that we perform the same dismiss animation when 
  dismissing via the button or via swipe.

Bug: 28443410
Change-Id: I309c38253e9c2dc78a5882dc663eec84a11619dd