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

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



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