Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev