Merge "Don't cache mIsUdfpsEnrolled"