[automerger skipped] Merge "Change the wakeup alarms for...

[automerger skipped] Merge "Change the wakeup alarms for "light-doze-maintenance step" to non-wakeup alarms" am: d1d21076 am: 7228ad6c am: e499e7db am: 8fe765d4 -s ours

am skip reason: Merged-In Ib9bf9e120c806e61eced99fbfb84cdb19d844e69 with SHA-1 27dd7080 is already in history

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

Change-Id: I7fadd185d91f42b30c40016046805d88901730f4