[automerger skipped] Merge "DO NOT MERGE: Cts Verifier screen layout modifed to show device owner test items on small displays" into oreo-mr1-cts-dev am: 08dacfe916 -s ours am: b2ddb5e287 -s ours
am: 6654f0ad75 -s ours
am skip reason: subject contains skip directive

Change-Id: Ief13ba4ea52f915222486d5b60be5c46e955c579