Attempts to fix policy

Build compiles but It needs to be tested
Merge branch 'jb-mr2' of https://github.com/ReVolt-ROM/frameworks_base into jb-mr2