Merge changes from topic 'am-0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus-aosp

* changes:
  Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239 am: ca8412c316
  Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: 081fd25237