Merge "Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 9120012566" into nyc-mr2-dev-plus-aosp