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

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



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