Merge "[Chooser/ResolverActivity] Fix flakiness in work profile tests" into tm-qpr-dev