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

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

Change-Id: I30c8857054d78d1b0234797ff67cc477311bcc73