am 56bc7156: Merge change 5537 into donut

Merge commit '56bc71565ecd72bf7a3e45b5c871b0407ed9f781'

* commit '56bc71565ecd72bf7a3e45b5c871b0407ed9f781':
  Add a test for SharedPreferencesBackupHelper