LPS-45276 - When assigning organizational roles, the search results only return site roles

Hi @jonmak08,

Attached is an update for https://issues.liferay.com/browse/LPS-45276.

I cherry picked the fix from 6.1.x.  

Please let me know if there are any issues.

Thanks!