Merge "Added priority to JobScheduler scheduling"

diff --cc core/java/android/app/job/JobInfo.java
index b899710,5aa4f79..9ad35d4
--- 1/core/java/android/app/job/JobInfo.java
--- 2/core/java/android/app/job/JobInfo.java
+++ b/core/java/android/app/job/JobInfo.java
@@@ -88,9 -83,9 +88,10 @@@ public class JobInfo implements Parcela
      private final boolean isPeriodic;
      private final boolean isPersisted;
      private final long intervalMillis;
 +    private final long flexMillis;
      private final long initialBackoffMillis;
      private final int backoffPolicy;
+     private final int priority;
  
      /**
       * Unique job id associated with this class. This is assigned to your job by the scheduler.

diff --cc services/core/java/com/android/server/job/JobSchedulerService.java
Simple merge

diff --cc services/core/java/com/android/server/job/JobStore.java
Simple merge

diff --cc services/core/java/com/android/server/job/controllers/JobStatus.java
Simple merge