[automerger skipped] Merge "Fix screen rotation during print tests." into nougat-mr1-cts-dev am: 2f5a6460f0  -s ours skipped: 1c27013195 skipped: c34174a807 skipped: e44b70a8b8
am: 838f7f23ec  -s ours

Change-Id: Id554963d2c6741fb34f9cf86a041fb7680055691