[automerger skipped] Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" into rvc-qpr-dev am: 9d451d5576 am: 37680920b8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522607 Change-Id: Ie56d5207275837fd58a9bccd16d7f1d4f714e6ad
This commit is contained in: