am c19c9e4e: am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread

Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1'

* commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes