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

Change-Id: Ic394eb3a058bbcc84aec2e08728e19138ad794c3