Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical...
Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab3 am: 0396aae6 am: ac23b229
Change-Id: Id6d7ff358769c86fab311b5b1161e8916169212e