Merge "DO NOT MERGE: Cts Verifier screen layout modifed to show device owner test items on small displays" into oreo-mr1-cts-dev