Merge "Ensure updateActiveUser is called before generateChallenge" into sc-dev

                }

            }

            scheduleUpdateActiveUserWithoutHandler(userId);

            final FaceGenerateChallengeClient client = new FaceGenerateChallengeClient(mContext,

                    mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), opPackageName,

                    mSensorId, mCurrentChallengeOwner);