Merge finger lock fix and quality improvements from upstream am: 4939a509c7

Original change: https://android-review.googlesource.com/c/platform/external/libchrome-gestures/+/3315652

Change-Id: I9a1ded18eac8a875726c33cc092a83882c57461c
Signed-off-by: Automerger Merge Worker <[email protected]>