Merge "Use cached KeyguardUpdateMonitor#isUdfpsEnrolled"