Merge "Fix DisplayTest for devices fixed-to-user-rotation enabled" into android13-tests-dev