Merge changes from topic "biometric-haptic" into sc-dev

* changes:
  2/n: Update fingerprint vibration logic
  1/n: Move UDFPS enroll haptics back to system_server