base

Merge change 8336 into donut

* changes:
  Remove the silent ringtone. I didn't realize that the ringtone picker already has an option to show a "Silent" item at the top, and having a separate silent ringtone conflicts with that in apps that choose to show it.