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

Change-Id: Ia689f1f67f63b7921d91669e3ad381587721cd7d