Merge "Merge "Skip inapplicable test on devices without rotation." into oc-dev am: de237cb7f4 am: e0b60b66b1 am: e50a730cee" into oc-mr1-dev-plus-aosp