Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms"