Merge "Modify Snapback spring stiffness" into tm-qpr-dev am: 7825481a9e

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

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