Merge "Change the wakeup alarms for "light-doze-maintenance step" to non-wakeup alarms" am: d1d210762b am: 7228ad6c73

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1907414

Change-Id: Ie70871a7b00170e0ddde6cf6001aee59eb6d585f