Merge "`OnScroll` roundness type should be reset to 0f when the View is...

Merge "`OnScroll` roundness type should be reset to 0f when the View is removed from the Shelf" into tm-qpr-dev am: 269cef1f am: 336fd3e3

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



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