Merge "Only do snapback animations on Swipeable views" into udc-dev am:...

Merge "Only do snapback animations on Swipeable views" into udc-dev am: 758dc44b am: e7f6f28a am: 348ec785 am: 2def5ff0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23348517



Change-Id: I84fb8f0f7b10e31fad1d4d7a947469411678e839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>