Merge "Fix user-id for AMS.forceStopPackageLocked()"

            // the package was initially frozen through KILL_APPLICATION_MSG, so

            // it doesn't hurt to use it again.)

            forceStopPackageLocked(app.info.packageName, UserHandle.getAppId(app.uid), false,

                    false, true, false, false, UserHandle.getUserId(app.userId), "start failure");

                    false, true, false, false, app.userId, "start failure");

            return false;

        }

    }