Merge "Merge "SwipeHelper simplifications" into udc-qpr-dev am: 2cd923ca"...

Merge "Merge "SwipeHelper simplifications" into udc-qpr-dev am: 2cd923ca" into udc-qpr-dev-plus-aosp am: 92d2531c

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



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