Merge "Add KEY_SATELLITE_NIDD_APN_NAME" into main