Merge \"Fix AppCompatBaseViewTest to work in landscape mode.\" into nyc-support-24.1-dev
am: 14708f2628

Change-Id: I65b76e48526899499b725d37aa996d09bd48a309