Merge "Fix crash when changing data restriction for non-app UID."