Merge "Add carrier_config_carrierid_1495_Spitfire.xml for Spitfire" into main