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