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: e7f6f28a am: 348ec785

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



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