Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom