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

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

Change-Id: I2c096c28c068924bae5ee34a8bab10b3c5897c83