Merge "Extreme battery saver: AlarmManager"

diff --cc services/core/java/com/android/server/AlarmManagerService.java
index ab252a4,4330f5d..ca15249
--- 1/services/core/java/com/android/server/AlarmManagerService.java
--- 2/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@@ -46,10 -46,8 +46,9 @@@ import android.os.Message
  import android.os.PowerManager;
  import android.os.Process;
  import android.os.RemoteException;
- import android.os.ServiceManager;
  import android.os.SystemClock;
  import android.os.SystemProperties;
 +import android.os.Trace;
  import android.os.UserHandle;
  import android.os.WorkSource;
  import android.provider.Settings;