Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab391

Change-Id: Ia4af051076066cb3cd66cb5d95162339b989dad4