LPS-39735

It's the same as https://github.com/brianchandotcom/liferay-portal/pull/13730, I only updated description of the first 2 commits.

/cc @rotty3000 

Thank you.

EDIT: I fixed a bug in StrictPortletPreferencesImpl -> getCompanyId() - caused by a merge with upstream.