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

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

Change-Id: I38d57b0ceaaf63fec5ca3cb5ff4b21997912016d