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