bf27786ba4
If a user has an AlarmClock going off within the next hour, the device won't go into deep Doze. When in Battery Saver, the system tries to enter deep Doze faster, scheduling an alarm one minute after the screen turns off to enter deep Doze. This conflict results in the system scheduling a wakeup alarm every minute until the AlarmClock alarm. Switching to a non-wakeup alarm prevents the system from waking up every minute if the device is in Battery Saver mode and there's an AlarmClock scheduled within the next hour. Bug: 135975445 Test: atest com.android.server.DeviceIdleControllerTest Change-Id: Ia60ec769979dc9a792dc73f2a6a646397af7adcb Merged-In: I98bf4131b7b4a1006e37aa42bcbc7dda7e137d1d