DO NOT MERGE - Fixing ringtones that were put in as notifications
DO NOT MERGE - Fixing ringtones that were put in as notifications

Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base