Merge "Update fingerprint haptic patterns" into oc-dr1-dev