Merge "Logging the caller uid state with AlarmScheduled atom" into sc-dev