Merge "Make fingerprint enroll/authenticate haptic feedback part of framework."