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

Change-Id: I3908b8d028067bca9b97a965698b6521ab9fd0c9