Merge "Update FingerprintEnrollEnrolling for UDFPS" into sc-dev