Merge "Support for lockscreen/keyguard sound effects."
tree: a020256c015aecea0e1e8609c1b4dfcc7c117b15
  1. policy/