Merge "Address uses of USER_SYSTEM in AppWidgetService." into main

                    // ... and see if these are hosts we've been awaiting.

                    // NOTE: We are backing up and restoring only the owner.

                    // TODO: http://b/22388012

                    if (newPackageAdded && userId == UserHandle.USER_SYSTEM) {

                    UserHandle mainUser = mUserManager.getMainUser();

                    if (newPackageAdded && mainUser != null && userId == mainUser.getIdentifier()) {

                        final int uid = getUidForPackage(pkgName, userId);

                        if (uid >= 0 ) {

                            resolveHostUidLocked(pkgName, uid);