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

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

Change-Id: I5902784ef9e27e52458fc67e43d70b4507569a20