Merge "Remove @Presubmit from SettingsBackupTest.Java"
am: 3c48bd72aa

Change-Id: I5a4f7c33ccb0a9ddff2778726055c7c059dfa281