Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev