Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am: 3601d3c239

Change-Id: I06edeb142fe780a80e679d08c0c8bf463737277b