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