Merge "added resource overlay config_satellite_sim_spn_identifier so the service provider name can be used to identify the network as non-terrestrial." into main