Merge "New permission to manage device admins"