Merge "Device or profile owner can let another app manage app restrictions"