Merge "Remove @Presubmit from SettingsBackupTest.Java" am: 3c48bd72aa am: 8138b8b3ed am: 40177a615e
am: 942e125a1a

Change-Id: I92423f3f662382308832c1b02e1bfaac1c951b7f