Merge "[automerger skipped] Merge "Fix screen rotation during print tests." into nougat-mr1-cts-dev am: 2f5a6460f0  -s ours" into oreo-cts-dev
am: 11e59718b9  -s ours

Change-Id: I11e205c48328c3ee13188ae4e857cd95522660ec