Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev