am c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb

* commit 'c6a5dfd81384e3937fb7773a206876d5ee8d48ff':
  Fix bug 3425610 Reduce lock / unlock sound level