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

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



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