Merge "Revert "KUM directly uses AuthController.isFaceEnrolled and isFingerprintEnrolled"" into udc-dev