Merge "Enable specification of 5G network info and carrier configs for ONS changes" into sc-dev-plus-aosp