am fd4ef4b1: am d2c9dcf7: am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 73516727 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev
* commit 'fd4ef4b1':
Revert "Update alarm sounds and tune some ringtones Bug: 73516727 Bug: 5502770 Bug: 7312457"