Merge "Added vibration back to UDFPS#onEnrollmentProgress" into tm-dev