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

Change-Id: Id6d7ff358769c86fab311b5b1161e8916169212e