Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev

    public UserHandle createAndInitializeUser(ComponentName who, String name,

            String ownerName, ComponentName profileOwnerComponent, Bundle adminExtras) {

        UserHandle user = createUser(who, name);

        if (user == null) {

            return null;

        }

        long id = Binder.clearCallingIdentity();

        try {

            String profileOwnerPkg = profileOwnerComponent.getPackageName();