Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom