Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""