Fix crash in the Alarm Manager service am: db9ae4217d
am: 01e1fcac29

Change-Id: I58d7b25b75da5c3997b5309eb612b6276288bf4b