Merge "AlarmManagerService: Fix FWR before boot completed"