Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev