Merge \"Fix LinearLayoutManagerResizeTest in landscape mode.\" into nyc-support-24.1-dev
am: ea42389d74

Change-Id: If38bafaa6a8a779e96b6a72a43d77be74bc02435