Merge "Remove cancelled job from evaluation list." into tm-dev am: ff2c2c8aa0 am: 9ef7cee4d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17663060

Change-Id: Ibc67c77ccc40794b4111f87c25056828b52e91c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);