Merge "Add carrier config nr_advanced_capable_pco_id_int" into sc-dev