Bug 1880328 - Fix state checking issues

android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/FxaDeviceConstellation.kt

@@ -115,7 +115,7 @@ class FxaDeviceConstellation(
                     AppServicesStateMachineChecker.handleInternalEvent(FxaStateCheckerEvent.CallError)
                     throw e
                 } catch (e: FxaUnauthorizedException) {
-                    AppServicesStateMachineChecker.handleInternalEvent(FxaStateCheckerEvent.CallError)
+                    AppServicesStateMachineChecker.handleInternalEvent(FxaStateCheckerEvent.EnsureCapabilitiesAuthError)
                     // Unless we've added a new capability, in practice 'ensureCapabilities' isn't
                     // actually expected to do any work: everything should have been done by initializeDevice.
                     // So if it did, and failed, let's report this so that we're aware of this!

android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/manager/AppServicesStateMachineChecker.kt

@@ -62,6 +62,7 @@ object AppServicesStateMachineChecker {
             Event.Account.Logout -> FxaEvent.Disconnect
             // This is the one ProgressEvent that's considered a "public event" in app-services
             is Event.Progress.AuthData -> FxaEvent.CompleteOAuthFlow(event.authData.code, event.authData.state)
+            is Event.Progress.CancelAuth -> FxaEvent.CancelOAuthFlow
             else -> return
         }
         rustChecker.handlePublicEvent(convertedEvent)