Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276a9

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

Change-Id: Ibfc8df340f6bab77d07791a9568892bc3c893638