[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
am: 1aa78e13e8  -s ours

Change-Id: Ic7f3bdd176ae52d6910f28416e410d8f795eb5cb