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

Change-Id: I622652209613f1bd113a90d22aa924f898ce6fe2