Merge \"Fix PopupMenuTest#testBasicContent in landscape.\" into nyc-support-24.1-dev
am: 22b228507f

Change-Id: I97f910fcfc79a8ed9f99c2d09964b135dce4c854