Merge "(1/2) Fix No clear steps for "re-enroll face unlock" into udc-dev