Merge "Fix for b/6176691: Move disk I/O during SCHEDULE_ALARM broadcast to a background thread."