Merge "Fixed test cases that rotated the device after the Save UI was shown." into oreo-mr1-cts-dev
am: e1d2087e54  -s ours

Change-Id: I9a84453315a40fa0073b1a5f6104ebfa2f0d0678