Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev
am: e44e9e94da

Change-Id: Ief515a2fb39bf69f456486e9413d0beee5f89eb5