am af5a45a7: am 74bc9b68: Merge "Implement music and user priority scheme in...
am af5a45a7: am 74bc9b68: Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev
* commit 'af5a45a7':
Implement music and user priority scheme in keyguard