Merge "[am] resolve service again when resetting userId in retrieveServiceLocked()" into rvc-dev

                            && mAm.isValidSingletonCall(callingUid, sInfo.applicationInfo.uid)) {

                        userId = 0;

                        smap = getServiceMapLocked(0);

                        ResolveInfo rInfoForUserId0 =

                                mAm.getPackageManagerInternalLocked().resolveService(service,

                                        resolvedType, flags, userId, callingUid);

                        if (rInfoForUserId0 == null) {

                            Slog.w(TAG_SERVICE,

                                    "Unable to resolve service " + service + " U=" + userId

                                            + ": not found");

                            return null;

                        }

                        sInfo = rInfoForUserId0.serviceInfo;

                    }

                    sInfo = new ServiceInfo(sInfo);

                    sInfo.applicationInfo = mAm.getAppInfoForUser(sInfo.applicationInfo, userId);