Merge "Revert "Fix CtsViewTests for Auto's DisplayArea based portrait UI."" into android12L-tests-dev