Merge "Let the job scheduler know when the user interacts with an app"

diff --cc core/java/android/app/usage/UsageStatsManagerInternal.java
Simple merge

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

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

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

diff --cc services/usage/java/com/android/server/usage/AppStandbyController.java
index 6782188,1bce958..8cb2eec
--- 1/services/usage/java/com/android/server/usage/AppStandbyController.java
--- 2/services/usage/java/com/android/server/usage/AppStandbyController.java
+++ b/services/usage/java/com/android/server/usage/AppStandbyController.java
@@@ -78,9 -77,9 +77,10 @@@ import com.android.internal.annotations
  import com.android.internal.app.IBatteryStats;
  import com.android.internal.os.SomeArgs;
  import com.android.internal.util.ArrayUtils;
 +import com.android.internal.util.ConcurrentUtils;
  import com.android.internal.util.IndentingPrintWriter;
  import com.android.server.LocalServices;
+ import com.android.server.usage.AppIdleHistory.AppUsageHistory;
  
  import java.io.File;
  import java.io.PrintWriter;

diff --cc services/usage/java/com/android/server/usage/UsageStatsService.java
Simple merge