Merge change 7395 into donut

* changes:
  Move the silent ringtone to ringtones/notifications, so it can be used for both.