Merge "Fix swipe thresholds not being propagated." into tm-dev am: ae925af0

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



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