RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms am: ac3d84392a am: 19411410c5 am: 706e8792eb

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

Change-Id: I91a0b94a5ccf50c2fd01ca8224d764eaf7d71353