Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9" into nyc-mr2-dev-plus-aosp