am 9e15ab77: am eb8e950e: Fix issue #2264162 and #2252436: Now playing screens problems when locked.

Merge commit '9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6' into eclair-mr2-plus-aosp

* commit '9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6':
  Fix issue #2264162 and #2252436: Now playing screens problems when locked.
tree: 7ed742c868e3753b788ce867b243fecd26f6f5f0
  1. policy/