Merge "OVERRIDE_NETWORK_TYPE_NR_ADVANCED use a different int id" into sc-dev