Merge "Fix AppCompatStateStatsTests for portrait devices that unfold into landscape." into stage-aosp-sc-v2-ts-dev