Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" into rvc-qpr-dev am: 9d451d5576

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

Change-Id: I235ac040862ca88094db9c7671816bad68f17cac