Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17" into nyc-mr2-dev-plus-aosp