Merge "Re-promote fixed test openPrivateSpaceSettings_triggersCorrectIntent to presubmit" into main