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: ee37fe39 am: a384cb94 am: 3096ec91

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



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