Merge "Add a flag for moving UdfpsEnroll* from SystemUI to settings."