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: Iffc4cb05d55b16f138200b40319ecfd8cdf889e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>