am 485d9afe: am a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev

* commit '485d9afe60c2e42ccccd95d7934c24c5c8b2c995':
  Backup and restore ringtone and notification ringtone