Merge changes from topic "presubmit-am-ea18b7bdcd494f359caebde79f549279" into tm-mainline-prod

* changes:
  [automerge] Remove cancelled job from evaluation list. 2p: be7816af8f
  Remove cancelled job from evaluation list.

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

@@ -1387,6 +1387,7 @@ public class JobSchedulerService extends com.android.server.SystemService
         if (mPendingJobQueue.remove(cancelled)) {
             mJobPackageTracker.noteNonpending(cancelled);
         }
+        mChangedJobList.remove(cancelled);
         // Cancel if running.
         mConcurrencyManager.stopJobOnServiceContextLocked(
                 cancelled, reason, internalReasonCode, debugReason);