Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" into rvc-qpr-dev