Merge "Check whether udfps is supported instead of enrolled" into sc-v2-dev