Merge "Add tweaks to smooth out swipe to dismiss. am: 5758a9a94c am: ddc6e0b7ae" into nyc-mr2-dev-plus-aosp
am: 6982f2df37

Change-Id: I80bd6833f616199717bbc069d9394d8442558cf0