Merge "Quick affordance gesture polish and haptics." into tm-qpr-dev am: 1746734f am: b0ed1ed4

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



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