Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Skip portrait test on devices not supporting rotation." into oreo-cts-dev am: db9a9ac045 -s ours am: 32b25798f9 -s ours am: 935d1fa1be -s ours
am: 2f698a37bb -s ours
am skip reason: subject contains skip directive

Change-Id: Ib42fbc075977175065c24f66e2599fa97bb672ce