Merge "Add satellite time configs to overlay config and carrier config" into main