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

Change-Id: If350c620f7536a3d31adfad503bcbb9d851eac8d