LPS-46132 Only read from companyId and not the request

This pull depends on https://github.com/brianchandotcom/liferay-portal/pull/18889