Merge "Update fingerprint haptic patterns" into oc-dr1-dev am: 4e1050f1cf
am: 927a8f19f4

Change-Id: I54d81d6c849d56878e333e2a6cb1f3f1af003d61