Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into...
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546 am: 63fb5ccc" into nyc-mr2-dev-plus-aosp
am: e85cf6ef
Change-Id: Ic8f84ab67a41def24b0884d19320c28d28d82e58