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

services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java

@@ -528,6 +528,8 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider {
                 }
             }
 
+            scheduleUpdateActiveUserWithoutHandler(userId);
+
             final FaceGenerateChallengeClient client = new FaceGenerateChallengeClient(mContext,
                     mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), opPackageName,
                     mSensorId, mCurrentChallengeOwner);