Cherry-picking unexpected logout fix to master

[wmathurin]

No description provided.

[github-actions]

	1 Error
🚫	Please re-submit this PR to the dev branch, we may have already fixed your issue.

Generated by 🚫 Danger

[github-actions]

	1 Warning
⚠️	libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKUpgradeManager.java#L152 - Consider using apply() instead; commit writes its data to persistent storage immediately, whereas apply will handle it in the background

Generated by 🚫 Danger

[codecov]

Codecov Report

❌ Patch coverage is 85.00000% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 56.41%. Comparing base (17171ff) to head (9bbca19).
⚠️ Report is 5 commits behind head on master.

Files with missing lines	Patch %	Lines
...alesforce/androidsdk/security/KeyStoreWrapper.java	76.92%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #2754      +/-   ##
============================================
+ Coverage     56.37%   56.41%   +0.03%     
- Complexity     2441     2448       +7     
============================================
  Files           204      204              
  Lines         16733    16753      +20     
  Branches       2315     2320       +5     
============================================
+ Hits           9434     9451      +17     
- Misses         6254     6257       +3     
  Partials       1045     1045              

Components	Coverage Δ
Analytics	47.92% <ø> (ø)
SalesforceSDK	44.08% <77.27%> (+0.09%)	⬆️
Hybrid	57.97% <ø> (ø)
SmartStore	78.20% <ø> (ø)
MobileSync	77.13% <ø> (ø)
React	52.36% <ø> (ø)

Files with missing lines	Coverage Δ
...ce/androidsdk/app/SalesforceSDKUpgradeManager.java	36.64% <100.00%> (+1.99%)	⬆️
...ce/androidsdk/security/SalesforceKeyGenerator.java	79.16% <100.00%> (+0.90%)	⬆️
...alesforce/androidsdk/security/KeyStoreWrapper.java	78.31% <76.92%> (-0.26%)	⬇️

... and 1 file with indirect coverage changes

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[wmathurin]

Only test failure (RestClientTest.testQueryWithBatchSize) is unrelated to the changes.