Lps 44048

Brian, please merge in these 2 pulls first:
https://github.com/brianchandotcom/liferay-portal/pull/19940
https://github.com/brianchandotcom/liferay-portal/pull/19941

Otherwise the test will break.