Merge "Allow ProfileOwner apps to manage app restrictions"