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

Change-Id: Iabdfda53f5af92f4f2113e43cf5c3480a23a59cb