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

Change-Id: I47772741ca2795ca162213c70c52ba55273a731f