Merge "Modify Snapback spring stiffness" into tm-qpr-dev am: 7825481a am: 00e0f8b4

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



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