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

* commit '832c54857519c405d7aa0d3bccfe74078f1a1abf':
  Update screen lock/unlock sound Bug: 5416299