Merge "Make the battery saver knobs hidden public,"

diff --cc services/core/java/com/android/server/am/BatteryStatsService.java
index 52f9702,43816c6..a035bd0
--- 1/services/core/java/com/android/server/am/BatteryStatsService.java
--- 2/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@@ -21,9 -21,9 +21,10 @@@ import android.content.Context
  import android.content.pm.ApplicationInfo;
  import android.content.pm.PackageManager;
  import android.net.wifi.WifiActivityEnergyInfo;
+ import android.os.PowerManager.ServiceType;
  import android.os.PowerSaveState;
  import android.os.BatteryStats;
 +import android.os.BatteryStatsInternal;
  import android.os.Binder;
  import android.os.Handler;
  import android.os.IBinder;

diff --cc services/core/java/com/android/server/location/GnssLocationProvider.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge