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

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



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