Merge "Introduce a new process state for location fg service"

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/app/ActivityManager.java
Simple merge

diff --cc core/java/android/app/AppOpsManager.java
Simple merge

diff --cc core/java/android/os/BatteryStats.java
Simple merge

diff --cc core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActiveServices.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/am/OomAdjuster.java
Simple merge

diff --cc services/core/java/com/android/server/am/ProcessList.java
Simple merge

diff --cc services/core/java/com/android/server/appop/AppOpsService.java
Simple merge