Merge "Settings: Add Permissions Management to AOKP [1/4]" into jb-mr1