am 0c6092e9: am 553a096b: Merge "remove keyguard permission" into jb-dev

* commit '0c6092e9c03aee494e1d52ec2d3dbbcd89a98298':
  remove keyguard permission