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

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



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