Merge "Fix AppCompatBaseViewTest to work in landscape mode." into nyc-support-24.1-dev