Merge "Fixes flaky CTS on the SimpleSaveActivityTest"